Changeset 25781 for trunk/ippScripts/scripts/ipp_cleanup.pl

Timestamp:

Oct 5, 2009, 5:11:19 PM (17 years ago)

Author:

watersc1

Message:

Edit to have a run marked for cleanup but that contains no entries to clean as error_STATE.

File:

• trunk/ippScripts/scripts/ipp_cleanup.pl (modified) (9 diffs)

trunk/ippScripts/scripts/ipp_cleanup.pl

@@ -91 +91 @@
 
     # if there are no chipProcessedImfiles (@$stdout_buf == 0), the reset the state to 'new'
+    # XXX Why? This could just mean there's nothing to cleanup, or that we're trying to rerun an errored run.
     if (@$stdout_buf == 0)  {
-        my $command = "$chiptool -chip_id $stage_id -updaterun -set_state new";
+        my $command = "$chiptool -chip_id $stage_id -updaterun -set_state $error_state";
         $command .= " -dbname $dbname" if defined $dbname;
 
@@ -123 +124 @@
             my $config_file = $ipprc->filename("PPIMAGE.CONFIG", $path_base, $class_id);
 
-#            if (!$config_file or ! -e $config_file) {
             unless ($ipprc->file_exists($config_file)) {
                 print STDERR "skipping cleanup for chipRun $stage_id $class_id "
@@ -199 +199 @@
                 &my_die("Unable to perform chiptool: $error_code", "chip", $stage_id, $error_code);
             }
+            
+            # We want to flag the run as well, to avoid attempting to reprocess the same data over and over again.
+            $command = "$chiptool -chip_id $stage_id -updaterun -set_state $error_state";
+            $command .= " -dbname $dbname" if defined $dbname;
+
+            ( $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);
+                &my_die("Unable to perform chiptool: $error_code", "chip", $stage_id, $error_code);
+
+            }
         }
     }
@@ -314 +326 @@
         $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
         &my_die("Unable to perform warptool: $error_code", "warp", $stage_id, $error_code);
+    }
+    
+    if (@$stdout_buf == 0) {
+        # No skycells were found for some reason.
+        # Not technically an "error," but a "you told me to do X, and I can't. Please fix this yourself."
+        my $command = "$warptool -updaterun -warp_id $stage_id -set_state $error_state";
+        $command .= " -dbname $dbname" if defined $dbname;
+        
+        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);
+            &my_die("Unable to perform warptool: $error_code", "warp", $stage_id, $error_code);
+        }
+        
+        exit(0);
     }
     my $metadata = $mdcParser->parse(join "", @$stdout_buf) or
@@ -389 +417 @@
                 &my_die("Unable to perform warptool: $error_code", "warp", $stage_id, $error_code);
             }
+
+
          } else {
             my $command = "$warptool -updateskyfile -warp_id $stage_id -skycell_id $skycell_id -set_state $error_state";
@@ -399 +429 @@
                 &my_die("Unable to perform warptool: $error_code", "warp", $stage_id, $error_code);
             }
-            exit $PS_EXIT_UNKNOWN_ERROR;
+
+            #            exit $PS_EXIT_UNKNOWN_ERROR;
         }
     }
@@ -422 +453 @@
         &my_die("Unable to perform stacktool: $error_code", "stack", $stage_id, $error_code);
     }
+
+    if (@$stdout_buf == 0) {
+        # No skycells were found for some reason.
+        # Not technically an "error," but a "you told me to do X, and I can't. Please fix this yourself."
+        my $command = "$stacktool -updaterun -stack_id $stage_id -set_state $error_state";
+        $command .= " -dbname $dbname" if defined $dbname;
+        
+        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);
+            &my_die("Unable to perform warptool: $error_code", "warp", $stage_id, $error_code);
+        }
+        
+        exit(0);
+    }
+
     my $metadata = $mdcParser->parse(join "", @{ $stdout_buf }) or 
         &my_die("Unable to parse metadata config doc", "stack", $stage_id, $PS_EXIT_PROG_ERROR);
@@ -523 +571 @@
         &my_die("Unable to perform difftool: $error_code", "diff", $stage_id, $error_code);
     }
+
+    if (@$stdout_buf == 0) {
+        # No skycells were found for some reason.
+        # Not technically an "error," but a "you told me to do X, and I can't. Please fix this yourself."
+        my $command = "$difftool -updaterun -diff_id $stage_id -set_state $error_state";
+        $command .= " -dbname $dbname" if defined $dbname;
+        
+        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);
+            &my_die("Unable to perform warptool: $error_code", "warp", $stage_id, $error_code);
+        }
+        
+        exit(0);
+    }
+
     my $metadata = $mdcParser->parse(join "", @{ $stdout_buf }) or 
         &my_die("Unable to parse metadata config doc", "diff", $stage_id, $PS_EXIT_PROG_ERROR);
@@ -646 +711 @@
     # if there are no fakeProcessedImfiles (@$stdout_buf == 0), the reset the state to 'new'
     if (@$stdout_buf == 0)  {
-        my $command = "$faketool -fake_id $stage_id -updaterun -set_state new";
+        my $command = "$faketool -fake_id $stage_id -updaterun -set_state $error_state";
         $command .= " -dbname $dbname" if defined $dbname;