Changeset 39942 for trunk

Timestamp:

Jan 12, 2017, 5:24:10 PM (10 years ago)

Author:

watersc1

Message:

Unsafe version of rawcheck.pl that doesn't check every instance, only checking enough copies to find a valid instance. This should be somewhat faster, as it does not require the md5sums that are building up on b node hosts.

File:

• trunk/ippScripts/scripts/rawcheck.pl (modified) (5 diffs)

trunk/ippScripts/scripts/rawcheck.pl

@@ -205 +205 @@
     my $existing_copies = 0;
     my $Ngood = 0;
+    my $Nbad  = 0;
     my %good_instances = ();
     my %bad_instances  = ();
+
+    #unsafe
+    my $continue_checking_md5sums = 1;
+    my %good_instances_unchecked  = ();
+    #end unsafe
 
     my @files = map {URI->new($_)->file if $_} @$instances;
@@ -220 +226 @@
             $instance_exists = 1;
             $existing_copies++;
-            $instance_md5sum = local_md5sum($files[$i]);
-            if ($instance_md5sum eq $md5sum) {
-                push @{ $good_instances{$instance_site} }, $i;
+            if ($continue_checking_md5sums == 1) { #unsafe
+                $instance_md5sum = local_md5sum($files[$i]);
+                if ($instance_md5sum eq $md5sum) {
+                    push @{ $good_instances{$instance_site} }, $i;
+                    $is_good = 1;
+                    $Ngood++;
+                }               
+                else {
+                    push @{ $bad_instances{$instance_site} }, $i;
+                    $Nbad++;
+                }
+            } #unsafe
+            else { #unsafe
+                $instance_md5sum = 'CHECKING_STOPPED';
+                push @{ $good_instances_unchecked{$instance_site} }, $i;
                 $is_good = 1;
                 $Ngood++;
-            }           
-            else {
-                push @{ $bad_instances{$instance_site} }, $i;
-            }
+            } #end unsafe
         }
         else {
@@ -239 +254 @@
                                   $instance_exists,$is_good,$instance_md5sum,
                                   $files[$i],$instance_host,$instance_volume);
+
+        #unsafe
+        # Remove this section when we decide to go back to actually checking everything
+        # to make sure we don't have any secret data corruption
+        if ($Ngood > 0) {
+            print "# Breaking from validation check, as a valid copy has been found.\n";
+            $continue_checking_md5sums = 0;
+        }
+        #end unsafe
     }
 
@@ -297 +321 @@
     ## leave everything in the best state possible.
     printf(">> %d %d\n",$Ngood, $#files + 1);
-    if ($Ngood != $#files + 1) {
+#    if ($Ngood != $#files + 1) {
+    if ($Nbad > 0) {
         my $good_copy;
         my $good_copy_index;
@@ -328 +353 @@
         if ($do_cull == 1) { $do_cull = -1; }
     }
+
+    #unsafe
+    foreach my $site_key (keys %good_instances_unchecked) {
+        push @{ $good_instances{$site_key} }, @{ $good_instances_unchecked{$site_key} };
+    }
+    #end unsafe
 
     ## We can now attempt to make replicated copies to the sites that require additional copies.