Changeset 30676 for branches/eam_branches/ipp-20110213/pstamp

Timestamp:

Feb 17, 2011, 3:20:07 PM (15 years ago)

Author:

eugene

Message:

merge changes from the trunk

Location:

branches/eam_branches/ipp-20110213/pstamp/scripts

Files:

• pstamp_checkdependent.pl (modified) (2 diffs)
• pstamp_finish.pl (modified) (1 diff)
• pstamp_get_image_job.pl (modified) (2 diffs)

branches/eam_branches/ipp-20110213/pstamp/scripts/pstamp_checkdependent.pl

@@ -193 +193 @@
 
     if (!$job_fault and ($stage eq 'chip')) {
-        # should only get here with data_state 'full' and perhaps destreaking not done
-        my_die ("Unexpected state for ${stage}Run $stage_id $state", $PS_EXIT_PROG_ERROR)
-            if $it->{data_state} ne 'full';
-
-        # chip processing is done, start destreaking.
-        my @chips;
-        push @chips, $it->{class_id};
-        $job_fault = check_states_magicDSRun($stage, $stage_id, \@chips, $rlabel, $need_magic, $it->{raw_magicked}, $it->{magic_ds_id}, $it->{dsRun_state});
+        # what about "error_cleaned" ?
+        if (! ($it->{data_state} =~ /cleaned/) ) {
+            # should only get here with data_state 'full' and perhaps destreaking not done
+            my_die ("Unexpected state for ${stage}Run $stage_id $state", $PS_EXIT_PROG_ERROR)
+                if $it->{data_state} ne 'full';
+
+            # chip processing is done, start destreaking.
+            my @chips;
+            push @chips, $it->{class_id};
+            $job_fault = check_states_magicDSRun($stage, $stage_id, \@chips, $rlabel, $need_magic, $it->{raw_magicked}, $it->{magic_ds_id}, $it->{dsRun_state});
+        }
     }
 
@@ -245 +248 @@
             # caller will fault the jobs
             return $error_code;
+        } elsif ($chip->{dsRun_state} eq 'failed_revert') {
+            # XXX: revert failures are rarely fixed. give up but say it's just not available not GONE 
+            print "magicDSRun.state = $dsRun_state for chipRun $stage_id is in state failed_revert cannot update\n";
+            return $PSTAMP_NOT_AVAILABLE;
         } elsif (($chip->{data_state} ne 'update') and ($chip->{data_state} ne 'full')) {
 

branches/eam_branches/ipp-20110213/pstamp/scripts/pstamp_finish.pl

@@ -228 +228 @@
                 close JRL;
             } else {
+                my_die("No reglist for successful job: $job_id", $req_id, $PS_EXIT_PROG_ERROR) 
+                    if $fault eq $PSTAMP_SUCCESS;
                 print STDERR "no reglist file for job $job_id\n" if $verbose;
                 print $tdf "$rownum|$fault|$error_string|0|$job_id|";

branches/eam_branches/ipp-20110213/pstamp/scripts/pstamp_get_image_job.pl

@@ -87 +87 @@
 }
 
-my $outdir = dirname($output_base);
-my $prefix = basename($output_base) . "_";
-my $results_file = $output_base . ".bundle_results";
 
 # Look for programs we need
@@ -99 +96 @@
 }
 
+my $outdir = dirname($output_base);
+my $basename = basename($path_base);
+my $outroot = $output_base ."_" . $basename;
+my $results_file = $output_base . ".bundle_results";
+
 {
     my $command = "$dist_bundle --camera $camera --stage $stage --stage_id $stage_id";
-    $command .= " --component $component";
-    $command .= " --path_base $path_base --outdir $outdir --results_file $results_file";
-    $command .= " --prefix $prefix";
+    $command .= " --results_file $results_file";
+    $command .= " --component $component --path_base $path_base --outroot $outroot";
+#    XXX: we need to do some work if we want to support muggle bundles
+#    $command .= " --no_magic if $no_magic";
     $command .= " --magicked" if $magicked;
-    # DANGER DANGER do not commit next line
-#    $command .= " --no_magic";
-    # DANGER DANGER do not commit last line
     $command .= " --dbname $dbname" if $dbname;
     $command .= " --verbose" if $verbose;