Changeset 29330 for trunk/pstamp/scripts/pstampparse.pl

Timestamp:

Oct 5, 2010, 3:35:07 PM (16 years ago)

Author:

bills

Message:

various postage stamp server fixes

File:

• trunk/pstamp/scripts/pstampparse.pl (modified) (2 diffs)

trunk/pstamp/scripts/pstampparse.pl

@@ -806 +806 @@
     my ($r_jobState, $r_fault, $r_dep_id, $imagedb, $state, $stage, $stage_id, $component, $need_magic) = @_;
 
-    # XXX: The update process for warp and subsequent stages requires # destreaking to be performed
-    # because the -pending queries require the inputs to have magicked >= 0
-    # The case of stack-stack diffs not needing to be destreaked is taken care of in pstamp_checkdependent
-    $need_magic = 1 if $imagedb eq 'gpc1';
+    if (($stage ne 'chip') and ($stage ne 'raw')) {
+        # XXX: The update process for warp and subsequent stages requires that destreaking to be performed
+        # because the -pending queries require the inputs to have magicked >= 0
+        # This is too conservative. For example stage is warp and the warp has never been destreaked we don't
+        # need magic either
+        # The case of stack-stack diffs not needing to be destreaked is taken care of in pstamp_checkdependent
+        # maybe we should put all of the smarts there and interpret the need_magic flag in the dependent as
+        # "The client needs to have magic performed" and let
+        # XXX: note the very nasty hard coding of gpc1
+        $need_magic = 1 if $imagedb eq 'gpc1';
+    }
 
     # chipRun's can be in full state if destreaking is necessary
@@ -900 +907 @@
                     $$r_newState = 'stop';
                     $$r_fault = $PSTAMP_NOT_AVAILABLE;
-                } elsif (!$image->{magicked}) {
+                } elsif ($need_magic and !$image->{magicked}) {
                     $$r_newState = 'stop';
                     $$r_fault = $PSTAMP_NOT_DESTREAKED;