Changeset 32926

Timestamp:

Dec 12, 2011, 1:52:21 PM (15 years ago)

Author:

bills

Message:

Remove requirement for destreaking from update processing

Location:

tags/ipp-20111110

Files:

• ippTools/share/chiptool_setimfiletoupdate.sql (modified) (2 diffs)
• ippTools/share/warptool_towarped.sql (modified) (1 diff)
• pstamp/scripts/pstamp_checkdependent.pl (modified) (8 diffs)

tags/ipp-20111110/ippTools/share/chiptool_setimfiletoupdate.sql

@@ -1 +1 @@
 UPDATE chipRun
     JOIN chipProcessedImfile USING(chip_id)
-    LEFT JOIN magicDSRun ON (stage_id = chip_id AND stage = 'chip')
-    LEFT JOIN magicDSFile ON (magicDSRun.magic_ds_id = magicDSFile.magic_ds_id
-                              AND component = class_id)
+    -- LEFT JOIN magicDSRun ON (stage_id = chip_id AND stage = 'chip')
+    -- LEFT JOIN magicDSFile ON (magicDSRun.magic_ds_id = magicDSFile.magic_ds_id
+      --                         AND component = class_id)
 SET chipRun.state = 'update', 
     chipProcessedImfile.data_state = 'update',
@@ -12 +12 @@
     AND (chipProcessedImfile.data_state = 'cleaned')
     -- don't queue update if the associated magicDSFile exists and isn't cleaned
-    AND (chipRun.magicked = 0 
-      OR ((magicDSRun.state = 'cleaned' OR magicDSRun.state = 'update')
-            AND (magicDSFile.data_state = 'cleaned' OR magicDSFile.data_state = 'update'))
-    )
+    -- AND (chipRun.magicked = 0 
+    --   OR ((magicDSRun.state = 'cleaned' OR magicDSRun.state = 'update')
+    --         AND (magicDSFile.data_state = 'cleaned' OR magicDSFile.data_state = 'update'))
+    -- )

tags/ipp-20111110/ippTools/share/warptool_towarped.sql

@@ -106 +106 @@
         -- where hook 2 %s
     GROUP BY warp_id, skycell_id
-    -- if warpSkyfile was magicked previously require inputs to be magicked
-    -- this blocks processing until all the chip inputs have been destreaked
-    HAVING COUNT(warpSkyCellMap.class_id) = SUM(IF(chipProcessedImfile.data_state ='full' and (chipRun.magicked = 0 OR chipProcessedImfile.magicked > 0), 1, 0))
+    HAVING COUNT(warpSkyCellMap.class_id) = SUM(IF(chipProcessedImfile.data_state ='full', 1, 0))
     -- limit hook 2 %s
     )

tags/ipp-20111110/pstamp/scripts/pstamp_checkdependent.pl

@@ -117 +117 @@
     }
 }
+
+# magic is no longer rquired
+$need_magic = 0;
+$magic_ok =  1;
 my $status = 0;
-if ((($it->{state} eq 'full') or ($it->{state} eq 'update')) and ($it->{data_state} eq 'full')
-        and (!$need_magic or $magic_ok or $it->{magicked} > 0)) {
+if ((($it->{state} eq 'full') or ($it->{state} eq 'update')) and ($it->{data_state} eq 'full')) {
 
     # This Dependency is satisfied. All done. Release the pstampJobs
@@ -197 +200 @@
     }
 
+if (0) {
     if (!$job_fault and ($stage eq 'chip')) {
         # what about "error_cleaned" ?
@@ -210 +214 @@
         }
     }
+}
 
     if ($job_fault >= $PSTAMP_FIRST_ERROR_CODE) {
@@ -255 +260 @@
             # caller will fault the jobs
             return $error_code;
-        } elsif ($chip->{dsRun_state} =~ /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')) {
 
@@ -290 +291 @@
             # fault the dependent
             my_die("chip $chip->{chip_id} $chip->{class_id} faulted: $chip->{fault}", $chip->{fault});
-        } elsif ($chip->{dsFile_fault} eq $PSTAMP_GONE) {
-            print STDERR "magicDSFile $chip->{magic_ds_id} $chip->{chip_id} $chip->{class_id} is GONE";
-            return $PSTAMP_GONE;
-        } elsif ($chip->{dsFile_fault} and ($chip->{dsFile_data_state} eq 'update')) {
-            # fault the dependent
-            my_die("magicDSFile $chip->{magic_ds_id} $chip->{chip_id} $chip->{class_id} faulted: $chip->{dsFile_fault}", $chip->{dsFile_fault});
-        }
-    }
-
-    my $status = 0;
-    if (!$queued_update) {
-        $status = check_states_magicDSRun('chip', $chip_id, \@chips, $rlabel, $need_magic, $raw_all_magicked, $magic_ds_id, $dsRun_state);
-    }
-
-    return $status;
+        }
+    }
+
+    return 0;
 }
 
@@ -323 +313 @@
     # The update system currently requires that data that has been magicked be destreaked
     # at chip stage so it needs magic even if the customer doesn't.
+if (0) {
     if ($metadata->{magicked} != 0) {
         $need_magic = 1;
     }
-
+}
     if (($state =~ /error/) or ($state =~ /purged/) or ($state =~ /scrubbed/) or ($state eq 'drop') or
          ($data_state =~ /error/) or ($data_state =~ /purged/) or ($data_state =~ /scrubbed/) or ($data_state eq 'drop')) {
@@ -423 +414 @@
     my $metadata = shift;
     my $rlabel = shift;     # if defined a new label for the chipRun
-    my $need_magic = shift; 
+    my $need_magic = 0; 
 
     my $diff_id   = $metadata->{diff_id};
@@ -429 +420 @@
     my $skycell = $metadata;
     my $skycell_id = $skycell->{skycell_id};
-
-    # The update system currently requires that data that has been magicked be destreaked
-    # at chip stage so it needs magic even if the customer doesn't.
-    if ($metadata->{magicked} != 0) {
-        $need_magic = 1;
-    }
 
     if ($diff_mode == $IPP_DIFF_MODE_WARP_STACK ) {