Changeset 41055 for branches/eam_branches/ipp-20191011

Timestamp:

Nov 5, 2019, 8:11:49 AM (7 years ago)

Author:

eugene

Message:

clean up errors for cull, find_instances_for_cull

File:

• branches/eam_branches/ipp-20191011/Nebulous/lib/Nebulous/Client.pm (modified) (6 diffs)

branches/eam_branches/ipp-20191011/Nebulous/lib/Nebulous/Client.pm

@@ -319 +319 @@
         $self->set_err("can not cull - not enough instances");
         $log->debug("leaving");
-
         return;
     }
@@ -335 +334 @@
 
     unless (defined $locations) {
-        $self->set_err( "no instances" );
         $log->debug( "leaving" );
-
         return;
     }
@@ -352 +349 @@
         }
     }
+
     # If we don't have two copies on one volume, see if we have two copies on a single 
     # cabinet. If so, delete the first of those copies.
@@ -363 +361 @@
         }
     }
+
     # Fail-safe. We didn't have any duplicates (the instances are "well-mixed"), so 
     # delete the first.
@@ -1028 +1027 @@
         $self->set_err($response->faultstring);
         # check to see if this failure is because $key doesn't exist
+        my $string = $response->faultstring;
         if ($response->faultstring =~ /is valid object key/) {
+            $self->set_err("invalid object key");
             $log->debug( "leaving" );
             return;
@@ -1034 +1035 @@
         # key is valid but no instances are on the specified volume
         if ($response->faultstring =~ /no instances on storage volume/) {
+            $self->set_err("no instances on storage volume or volume is not available");
             $log->debug( "leaving" );
             return;