Changeset 39965 for trunk

Timestamp:

Jan 31, 2017, 5:40:06 PM (9 years ago)

Author:

watersc1

Message:

Change to permcheck.pl to add burntool stage. Switch md5sum calculation for size calculation for small files. This is faster, and will rebalance the shuffle code in favor of data transfer over md5sums.

File:

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

trunk/ippScripts/scripts/permcheck.pl

@@ -19 +19 @@
 
 my $missing_tools = 0;
-#my $regtool  = can_run('regtool') or (warn "Can't find regtool" and $missing_tools = 1);
+my $regtool  = can_run('regtool') or (warn "Can't find regtool" and $missing_tools = 1);
 my $chiptool = can_run('chiptool') or (warn "Can't find chiptool" and $missing_tools = 1);
 my $camtool = can_run('camtool') or (warn "Can't find camtool" and $missing_tools = 1);
@@ -249 +249 @@
         &my_die("Unable to parse metadata from stagetool", $stage_id);
 }
+elsif ($stage eq 'burntool') {
+    my $cmd = "$regtool -processedimfile -exp_id $stage_id -dbname $dbname";
+    my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) = 
+        run(command => $cmd, verbose => 0);
+    unless ($success) {
+        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+        &my_die("Unable to perform stagetool: $error_code", $stage_id);
+    }
+    $imfiles = $mdcParser->parse_list(join "", @$stdout_buf) or
+        &my_die("Unable to parse metadata from stagetool", $stage_id);
+}
 
 my $timer_start = time();
@@ -258 +269 @@
                   'skycal' => ['PSASTRO.OUTPUT.CMF','PSPHOT.OUTPUT.CFF'],
                   'ff'     => ['PSPHOT.OUT.CMF.MEF','PSPHOT.OUTPUT.CFF','PSPHOT.FULLFORCE.OUTPUT'],
-                  'diff'   => ['PPSUB.OUTPUT.SOURCES','PPSUB.INVERSE.SOURCES','PSPHOT.PSF.SKY.SAVE','PSPHOT.BACKMDL.MEF','PPSUB.OUTPUT.KERNELS']
+                  'diff'   => ['PPSUB.OUTPUT.SOURCES','PPSUB.INVERSE.SOURCES','PSPHOT.PSF.SKY.SAVE','PSPHOT.BACKMDL.MEF','PPSUB.OUTPUT.KERNELS'],
+                  'burntool' => ['BURN.TABLE.DOESNT.HAVE.A.PRODUCT']
     );
 
@@ -329 +341 @@
                 $is_done = 1;
             }
-
         }           
+        elsif ($stage eq 'burntool') {
+            if ($product eq 'BURN.TABLE.DOESNT.HAVE.A.PRODUCT') {
+                my $bt_file = $imfiles->{uri};
+                $bt_file    =~ s/fits$/burn.tbl/;
+                push @keys, $bt_file;
+            }
+            $is_done = 1;
+        }
+
         if ($is_done == 0) {
             push @keys, $ipprc->filename($product,$path_base);
@@ -552 +572 @@
     $host =~ s/\.\d//;
 #    print "$filename $host $volume\n";
-    my $response = `ssh $host remote_md5sum.pl $filename`;
-    chomp($response);
+    my $response;
+    my @file_stat = stat($filename);
+    if ($file_stat[7] > 1e7) {
+        $response = `ssh $host remote_md5sum.pl $filename`;
+        chomp($response);
+    }
+    else {
+        $response = $file_stat[7];
+    }
     my ($sum, undef) = split /\s+/, $response;
     unless(defined($sum)) {