Changeset 24996 for trunk/Nebulous/lib

Timestamp:

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

Author:

jhoblitt

Message:

add neb-cull --one_only flag

File:

• trunk/Nebulous/lib/Nebulous/Client.pm (modified) (8 diffs)

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($@);
     }