Changeset 29350

Timestamp:

Oct 7, 2010, 3:09:01 PM (16 years ago)

Author:

bills

Message:

When checking the status of chip being updated as a result of a warp or diff update
fault the dependent if the chipProcessedImfile or magicDSFile is faulted.
Very very important enhancement for Bill's sanity

Location:

tags/ipp-20100823

Files:

• ippTools/share/warptool_scmap.sql (modified) (2 diffs, 1 prop)
• pstamp/scripts/pstamp_checkdependent.pl (modified) (2 diffs, 1 prop)

tags/ipp-20100823/ippTools/share/warptool_scmap.sql

@@ -7 +7 @@
     chipRun.state,
     chipProcessedImfile.data_state,
+    chipProcessedImfile.fault AS chip_fault,
     chipProcessedImfile.magicked,
-    rawImfile.magicked AS raw_magicked
+    rawImfile.magicked AS raw_magicked,
+    IFNULL(magicDSRun.magic_ds_id, 0) AS magic_ds_id,
+    IFNULL(magicDSRun.state, 0) AS dsRun_state,
+    IFNULL(magicDSFile.fault, 0) as dsFile_fault
 FROM warpRun
 JOIN warpSkyCellMap
@@ -26 +30 @@
     ON chipRun.exp_id = rawImfile.exp_id
     AND chipProcessedImfile.class_id = rawImfile.class_id
+LEFT JOIN magicDSRun
+    ON chipRun.chip_id = magicDSRun.stage_id AND magicDSRun.stage = 'chip'
+LEFT JOIN magicDSFile
+    ON magicDSFile.magic_ds_id = magicDSRun.magic_ds_id 
+        AND chipProcessedImfile.class_id = magicDSFile.component
 WHERE
     1

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

@@ -239 +239 @@
                     print "skipping $command\n";
                 }
+            } elsif ($chip->{fault}) {
+                # fault the dependent
+                my_die("chip $chip->{chip_id} $chip->{class_id} faulted: $chip->{fault}", $chip->{fault});
+            } elsif ($chip->{dsFile_fault}) {
+                # fault the dependent
+                my_die("magicDSFile $chip->{magic_ds_id} $chip->{chip_id} $chip->{class_id} faulted: $chip->{dsFile_fault}", $chip->{dsFile_fault});
             }
         }
@@ -317 +323 @@
             if (($chip->{data_state} ne 'full') or ($need_magic and ($chip->{magicked} <= 0))) {
                 $chips_ready = 0;
+                $chip->{fault} = $chip->{chip_fault};
                 push @chipsToUpdate, $chip;
             } else {