Changeset 38364

Timestamp:

Jun 4, 2015, 12:20:39 PM (11 years ago)

Author:

watersc1

Message:

Not sure why it wasn't happy before, but I've made the "is an instance supposed to be on this volume" check more explicit.

File:

• trunk/tools/stsci_disks/p1_clear.pl (modified) (7 diffs)

trunk/tools/stsci_disks/p1_clear.pl

@@ -92 +92 @@
     my @vols;
     my @md5sums;
-
+    my @skip;
 # Pre scan
     for (my $i = 0; $i <= $#files; $i++) {
@@ -126 +126 @@
 
             $md5sums[$i] = local_md5sum($f);
+            unless (defined($md5sums[$i])) {
+                die("Failed to calculate md5sum locally. $f ");
+            }
             # Get a target
             $vols[$i] = get_volume($keys[$i]);
@@ -133 +136 @@
             
             # Check that we actually have a key on the host we're checking.
-            my $local_uris = $neb->find_instances($keys[$i],"~" . $host . "." . $volume);
+            my $local_uris = $neb->find_instances($keys[$i],"~${host}.${volume}");
             if ($#{ $local_uris } == -1) { 
                 $vols[$i] = undef();
@@ -159 +162 @@
 # Do a replication pass
     for (my $i = 0; $i <= $#files; $i++) {
+        $skip[$i] = 0;
         if ($belongs[$i] == 0) {
             if (defined($vols[$i])) {
-                $neb->replicate($keys[$i],$vols[$i]) or die "failed to replicate a copy to the backup node";
-                if ($@) { die $@; }
+                unless ($neb->replicate($keys[$i],$vols[$i])) {
+                    $skip[$i] = 1;
+                }
+#               if ($@) { die $@; }
             }
             else {
@@ -180 +186 @@
 # Do the check pass
     for (my $i = 0; $i <= $#files; $i++) {
+        if ($skip[$i] == 1) { next; }
         my $uri;
         if ($belongs[$i] == 0) {
@@ -193 +200 @@
 
             my $tmpmd5 = local_md5sum($uri);
+            unless (defined($tmpmd5)) { 
+                next; 
+            }
             if ($tmpmd5 ne $md5sums[$i]) { 
                 if (defined($vols[$i])) {
@@ -311 +321 @@
     chomp($response);
     my ($sum, undef) = split /\s+/, $response;
-    unless(defined($sum)) {
-        die("Failed to calculate md5sum locally. $filename $host $volume");
-    }
+     unless(defined($sum)) {
+         warn("Failed to calculate md5sum locally. $filename $host $volume");
+     }
     return($sum);
 }