Changeset 24996

Timestamp:

Aug 4, 2009, 11:42:45 AM (17 years ago)

Author:

jhoblitt

Message:

add neb-cull --one_only flag

Location:

trunk/Nebulous

Files:

• Changes (modified) (1 diff)
• MANIFEST (modified) (1 diff)
• bin/neb-cull (modified) (6 diffs)
• lib/Nebulous/Client.pm (modified) (8 diffs)
• t/72_neb-cull.t (added)

trunk/Nebulous/Changes

@@ -8 +8 @@
     - add Nebulous::Client->prune() method
     - add Nebulous::Client->there_can_be_only_one() method
+    - add neb-cull --one_only flag
 
 0.10

trunk/Nebulous/MANIFEST

@@ -102 +102 @@
 t/70_neb-ls.t
 t/71_client_there_can_be_only_one.t
+t/72_neb-cull.t
 t/90_nebclient.t
 t/TEST.PL

trunk/Nebulous/bin/neb-cull

@@ -16 +16 @@
 use Pod::Usage qw( pod2usage );
 
-my ($server, $volume);
+my ($server, $volume, $one_only);
 
 $server = $ENV{'NEB_SERVER'} unless $server;
@@ -23 +23 @@
     'server|s=s'    => \$server,
     'volume|v=s'    => \$volume,
+    'one_only|o'    => \$one_only,
 ) || pod2usage( 2 );
 
@@ -40 +41 @@
     unless defined $neb;
 
+my @cull_args;    
+push @cull_args, $key;
 if (defined $volume) {
-    $neb->cull($key, $volume)
-        or die "failed to replicate Nebulous key: $key";
+    push @cull_args, $volume;
+}
+
+if ($one_only) {
+    my $status = $neb->there_can_be_only_one(@cull_args);
+    if ($status == 0) {
+        die "not enough instances of Nebulous key: $key";
+    }
+    if (not defined $status or $status < 1) {
+        die "failed to cull Nebulous key: $key - " . $neb->err
+            if defined $neb->err;
+        die "failed to cull Nebulous key: $key";
+    }
 } else {
-    $neb->cull($key)
-        or die "failed to replicate Nebulous key: $key";
+    unless (defined $neb->cull(@cull_args)) {
+        die "failed to cull Nebulous key: $key - " . $neb->err;
+    }
 }
 
@@ -58 +73 @@
 =head1 SYNOPSIS
 
-    neb-cull [--server <URL>] [--volume <volume name>] <key>
+    neb-cull [--server <URL>] [--volume <volume name>] [--one_only] <key>
 
 =head1 DESCRIPTION
@@ -77 +92 @@
 
 Symbolic name of the volume to create the new instance on.
+
+Optional.
+
+=item * --one_only|-o
+
+Removes all but one instances of an object.  Any inaccessible instances are
+removed.  If C<--volume> is specified, and an instance exists on that volume,
+all instances but the one on that volume are removed.
 
 Optional.
@@ -110 +133 @@
 =head1 COPYRIGHT
 
-Copyright (C) 2007-2008  Joshua Hoblitt.  All rights reserved.
+Copyright (C) 2007-2009  Joshua Hoblitt.  All rights reserved.
 
 This program is free software; you can redistribute it and/or modify it under

trunk/Nebulous/lib/Nebulous/Client.pm

@@ -297 +297 @@
         my $instances = $stats[6];
         if (defined $instances and $instances < 2) {
-            $log->debug("can not cull - not enough instances");
+            $self->set_err("can not cull - not enough instances");
             $log->debug("leaving");
 
@@ -305 +305 @@
         $locations = $self->find_instances($key, $vol_name);
         unless (defined $locations) {
-            $log->debug( "no instances" );
+            $self->set_err( "no instances" );
             $log->debug( "leaving" );
 
@@ -313 +313 @@
         $locations = $self->find_instances($key);
         unless ($locations) {
-            $log->debug("no instances");
+            $self->set_err( "no instances" );
             $log->debug("leaving");
 
@@ -320 +320 @@
 
         if (scalar @{ $locations } < 2) {
-            $log->debug("can not cull - not enough instances");
+            $self->set_err("can not cull - not enough instances");
             $log->debug("leaving");
 
@@ -365 +365 @@
         if (not defined $self->prune($key)) {
             # use the prune() method to also determine if $key is valid
-            $removed = undef;
-            return;
+            die "invalid key: $key";
         }
 
@@ -377 +376 @@
         if (defined $locations) {
             my $instances = $self->find_instances($key);
+            if (scalar @$instances < 2) {
+                die "not enough instances";
+            }
             foreach my $victim (@$instances) {
                 next if $victim eq $locations->[0];
@@ -387 +389 @@
             # start at one so cull() is called one less time then the # of
             # instances
+            if ($stats->[6] < 2) {
+                die "not enough instances";
+            }
             for (my $i = 1; $i < $stats->[6]; $i++) {
                 $self->cull($key);
@@ -395 +400 @@
     };
     if ($@) {
+        if ($@ =~ qr/invalid key/) {
+            $self->set_err($@);
+            return;
+        }
         $log->logdie($@);
     }