Changeset 33052

Timestamp:

Jan 9, 2012, 1:43:55 PM (14 years ago)

Author:

bills

Message:

if -tofullimfile fails wait 10 seconds and try again. Appaerntly during updates we trigger a deadlock and
this works around it

File:

• trunk/ippScripts/scripts/chip_imfile.pl (modified) (4 diffs)

trunk/ippScripts/scripts/chip_imfile.pl

@@ -147 +147 @@
 my $outputBin2;
 my $dump_config = 1;
+my $do_stats = 1;
+$outputStats   = prepare_output("PPIMAGE.STATS",         $outroot, $class_id, 1);
 my $do_binned_images = 1;
 if ($run_state eq 'new') {
     # prepare the files that are only created for a new run
     $configuration = prepare_output("PPIMAGE.CONFIG",        $outroot, $class_id, 1);
-    $outputStats   = prepare_output("PPIMAGE.STATS",         $outroot, $class_id, 1);
 } else {
     $configuration = $ipprc->filename('PPIMAGE.CONFIG', $outroot, $class_id) 
@@ -196 +197 @@
 unless ($no_op) {
     my $command;
-    my $do_stats;
 
     ## get the ppImage recipe for this camera and CHIP reduction
@@ -470 +470 @@
         $command .= " -Db PPIMAGE:PHOTOM FALSE";
     }
-    if ($run_state eq "new") {
+    if ($run_state eq "new" or $do_stats) {
         $command .= " -recipe PPSTATS CHIPSTATS";
         $command .= " -stats $outputStats";
@@ -562 +562 @@
 
 # Add the processed file to the database
-unless ($no_update) {
-    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => $verbose);
-    unless ($success) {
-        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-        warn("Unable to perform chiptool -addprocessedimfile: $error_code\n");
-        exit($error_code);
-    }
-} else {
-    print "skipping command: $command\n";
+my $tries = 0;
+while (1) {
+    $tries++;
+    unless ($no_update) {
+        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+            run(command => $command, verbose => $verbose);
+        unless ($success) {
+            $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+            warn("Unable to perform chiptool -addprocessedimfile: $error_code\n");
+            exit($error_code) if $tries >= 3;
+            warn("Waiting 10 seconds to try again\n");
+            sleep 10;
+        } else {
+            last;
+        }
+    } else {
+        print "skipping command: $command\n";
+        last;
+    }
 }