Changeset 36370 for branches/eam_branches/ipp-20130904/ippScripts/scripts/rawcheck.pl

Timestamp:

Dec 10, 2013, 2:14:21 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130904

Files:

• . (modified) (1 prop)
• ippScripts/scripts/rawcheck.pl (modified) (7 diffs)

branches/eam_branches/ipp-20130904/ippScripts/scripts/rawcheck.pl

@@ -81 +81 @@
 my $regtool_cmd = "$regtool -processedimfile -exp_id $exp_id -dbname $dbname";
 my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) = 
-    run(command => $regtool_cmd, verbose => 1);
+    run(command => $regtool_cmd, verbose => 0);
 unless ($success) {
     $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
@@ -133 +133 @@
             $existance[$i] = 1;
             $existing_copies++;
-            my $fh;
-            open($fh,$files[$i]);
-            $md5sums[$i] = Digest::MD5->new->addfile($fh)->hexdigest;
+            $md5sums[$i] = local_md5sum($files[$i]);
+#           my $fh;
+#           open($fh,$files[$i]);
+#           $md5sums[$i] = Digest::MD5->new->addfile($fh)->hexdigest;
+#           close($fh);
             $md5sum_uniq{$md5sums[$i]} = 1;
-            close($fh);
+
         }
         else {
@@ -223 +225 @@
 # Begin my best validation thought
         {
-            my $fh;
-            open($fh,$files[0]);
-            my $tmpmd5 = Digest::MD5->new->addfile($fh)->hexdigest;
-            close($fh);
+            my $tmpmd5 = local_md5sum($files[0]);
+#           my $fh;
+#           open($fh,$files[0]);
+#           my $tmpmd5 = Digest::MD5->new->addfile($fh)->hexdigest;
+#           close($fh);
             if ($tmpmd5 ne $md5sum) { 
                 die "Post-replication md5sum does not match! $tmpmd5 != $md5sum";
@@ -257 +260 @@
                 my $uris = $neb->find_instances($key,$rep_vol);
                 @$uris = map {URI->new($_)->file if $_} @$uris;
-                my $fh;
-                open($fh,${ $uris }[0]);
-                my $tmpmd5 = Digest::MD5->new->addfile($fh)->hexdigest;
-                close($fh);
+                my $tmpmd5 = local_md5sum(${ $uris }[0]);
+#               my $fh;
+#               open($fh,${ $uris }[0]);
+#               my $tmpmd5 = Digest::MD5->new->addfile($fh)->hexdigest;
+#               close($fh);
                 if ($tmpmd5 ne $md5sum) { 
                     die "Post-replication md5sum does not match! $tmpmd5 != $md5sum";
@@ -282 +286 @@
 
 #               print $uris . " " . ${ $uris }[0] . " \n";
-                my $fh;
-                open($fh,${ $uris }[0]);
-
-                my $tmpmd5 = Digest::MD5->new->addfile($fh)->hexdigest;
-                close($fh);
+                my $tmpmd5 = local_md5sum(${ $uris }[0]);
+#               my $fh;
+#               open($fh,${ $uris }[0]);
+#               my $tmpmd5 = Digest::MD5->new->addfile($fh)->hexdigest;
+#               close($fh);
                 if ($tmpmd5 ne $md5sum) { 
                     die "Post-replication md5sum does not match! $tmpmd5 != $md5sum";
@@ -318 +322 @@
 }
 
+sub local_md5sum {
+    my $filename = shift;
+    my $volume   = (split /\//, $filename)[2];
+    my $host     = $volume;
+    $host =~ s/\.\d//;
+#    print "$filename $host $volume\n";
+    my $response = `ssh $host md5sum $filename`;
+    chomp($response);
+    my ($sum, undef) = split /\s+/, $response;
+    unless(defined($sum)) {
+        my_die("Failed to calculate md5sum locally. $filename $host $volume");
+    }
+    return($sum);
+}
+
+
 sub parse_volume {
     my $filename = shift(@_);
@@ -341 +361 @@
 }
 
-        
-
-
 sub my_die {
     my $msg = shift(@_);