Changeset 25465 for trunk

Timestamp:

Sep 21, 2009, 2:49:37 PM (17 years ago)

Author:

bills

Message:

Detect the completion and state updates of a magicDSRun in a new advance task.

Location:

trunk

Files:

• ippTasks/destreak.pro (modified) (8 diffs)
• ippTools/share/magicdstool_completed_runs.sql (modified) (6 diffs)
• ippTools/src/magicdstool.c (modified) (11 diffs)
• ippTools/src/magicdstool.h (modified) (1 diff)
• ippTools/src/magicdstoolConfig.c (modified) (3 diffs)

trunk/ippTasks/destreak.pro

@@ -13 +13 @@
 ### indexes into Database lists
 $magicToDS_DB = 0
+$magicDSAdvance_DB = 0
 $magicDSToRevert_DB = 0
 $magicDSCompletedRevert_DB = 0
@@ -41 +42 @@
 ### Turn tasks on
 macro destreak.on
+    # destreak and revert should not run at the same time
+    destreak.revert.off
+
     task destreak.load
         active true
@@ -47 +51 @@
         active true
     end
+    task destreak.advance
+        active true
+    end
 end
 
 macro destreak.revert.on
+    # destreak and revert should not run at the same time
+    destreak.off
+
     task destreak.revert.load
         active true
@@ -67 +77 @@
     end
     task destreak.run
+        active false
+    end
+    task destreak.advance
         active false
     end
@@ -100 +113 @@
   npending     1
 
-  stdout NULL
-  stderr $LOGDIR/magic.destreak.log
+#  stdout NULL
+#  stderr $LOGSUBDIR/destreak.load.log
 
   task.exec
@@ -233 +246 @@
 end
 
+task           destreak.advance
+    # task to finish processing for magicDSRuns 
+  host         local
+
+  periods      -poll $LOADPOLL
+  #periods      -exec $LOADEXEC
+  periods      -exec 30
+  periods      -timeout 20
+  npending     1
+
+#  stdout NULL
+#  stderr $LOGSUBDIR/destreak.advance.log
+
+  task.exec
+    $run = magicdstool -advancerun 
+    if ($DB:n != 0)
+
+      $run = $run -dbname $DB:$magicDSAdvance_DB
+
+      $magicDSAdvance_DB ++
+      if ($magicDSAdvance_DB >= $DB:n) set magicDSAdvance_DB = 0
+    end
+    add_poll_args run
+    add_poll_labels run
+    command $run
+  end
+
+  # success
+  task.exit    0
+  end
+
+  # locked list
+  task.exit    default
+    showcommand failure
+  end
+
+  task.exit    crash
+    showcommand crash
+  end
+
+  # operation times out?
+  task.exit    timeout
+    showcommand timeout
+  end
+end
+
 task           destreak.revert.load
   host         local
@@ -386 +445 @@
 
   stdout NULL
-  stderr $LOGSUBDIR/destreak.completed.revert
+  stderr $LOGSUBDIR/destreak.completed.revert.log
 
   task.exec
@@ -398 +457 @@
       $run = $run -dbname $DB:$magicDSCompletedRevert_DB
 
+      $magicDSCompletedRevert_DB ++
       if ($magicDSCompletedRevert_DB >= $DB:n) set magicDSCompletedRevert_DB = 0
     end

trunk/ippTools/share/magicdstool_completed_runs.sql

@@ -1 +1 @@
 SELECT DISTINCT
-    magic_ds_id
+    magic_ds_id,
+    re_place,
+    label
 FROM
     (
 -- raw stage
 SELECT
-    magicDSRun.magic_ds_id
+    magicDSRun.*
     FROM magicDSRun
     JOIN rawImfile ON stage_id = rawImfile.exp_id
@@ -23 +25 @@
 -- chip stage
 SELECT
-    magicDSRun.magic_ds_id
+    magicDSRun.*
     FROM magicDSRun
     JOIN chipProcessedImfile ON stage_id = chip_id
@@ -42 +44 @@
 -- camera stage
 SELECT
-    magicDSRun.magic_ds_id
+    magicDSRun.*
     FROM magicDSRun
     JOIN camProcessedExp ON stage_id = camProcessedExp.cam_id
@@ -59 +61 @@
 -- warp stage
 SELECT
-    magicDSRun.magic_ds_id
+    magicDSRun.*
     FROM magicDSRun
     JOIN warpSkyfile on stage_id = warp_id
@@ -79 +81 @@
 -- diff stage
 SELECT DISTINCT
-    magicDSRun.magic_ds_id
+    magicDSRun.*
     FROM magicDSRun
     JOIN magicRun USING (magic_id)
@@ -101 +103 @@
         AND SUM(magicDSFile.fault) = 0
 
-   ) as Foo
+   ) as magicDSRun

trunk/ippTools/src/magicdstool.c

@@ -37 +37 @@
 static bool todestreakMode(pxConfig *config);
 static bool adddestreakedfileMode(pxConfig *config);
+static bool advancerunMode(pxConfig *config);
 static bool revertdestreakedfileMode(pxConfig *config);
 static bool getskycellsMode(pxConfig *config);
@@ -44 +45 @@
 
 static bool setmagicDSRunState(pxConfig *config, psS64 magic_id, const char *state);
-static bool magicDSRunComplete(pxConfig *config, bool setmagicked);
 static bool magicDSGetIDs(pxConfig *config, psString stage, psS64 magic_id, psS64 *stage_id, psS64 *cam_id);
 
@@ -70 +70 @@
         MODECASE(MAGICDSTOOL_MODE_TODESTREAK,          todestreakMode);
         MODECASE(MAGICDSTOOL_MODE_ADDDESTREAKEDFILE,   adddestreakedfileMode);
+        MODECASE(MAGICDSTOOL_MODE_ADVANCERUN,          advancerunMode);
         MODECASE(MAGICDSTOOL_MODE_REVERTDESTREAKEDFILE,revertdestreakedfileMode);
         MODECASE(MAGICDSTOOL_MODE_GETSKYCELLS,         getskycellsMode);
@@ -119 +120 @@
     PXOPT_COPY_S64(config->args, where, "-warp_id", "warp_id", "==");
     PXOPT_COPY_S64(config->args, where, "-diff_id", "diff_id", "==");
-    PXOPT_COPY_S64(config->args, where, "-magic_id","magic_id", "==");
+    PXOPT_COPY_S64(config->args, where, "-magic_id","magicRun.magic_id", "==");
     PXOPT_COPY_S32(config->args, where, "-streaks_max","streaks", "<=");
 
@@ -661 +662 @@
     }
 
-    if (!magicDSRunComplete(config, setmagicked)) {
-            // rollback
-        if (!psDBRollback(config->dbh)) {
-            psError(PS_ERR_UNKNOWN, false, "database error");
-        }
-        psError(PS_ERR_UNKNOWN, false, "database error");
-        return false;
-    }
-
     if (!psDBCommit(config->dbh)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
@@ -743 +735 @@
 }
 
-static bool magicDSRunComplete(pxConfig *config, bool setmagicked)
+static bool advancerunMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
+
+    psMetadata *where = psMetadataAlloc();
+    PXOPT_COPY_S64(config->args, where, "-magic_ds_id", "magicDSRun.magic_ds_id", "==");
+    pxAddLabelSearchArgs (config, where, "-label", "magicDSRun.label", "==");
+
+    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
 
     // look for completed magicDSRuns
@@ -754 +752 @@
     }
 
+    if (psListLength(where->list)) {
+        psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
+        psStringAppend(&query, " WHERE %s", whereClause);
+        psFree(whereClause);
+    }
+
     if (!p_psDBRunQuery(config->dbh, query)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
@@ -771 +775 @@
         return true;
     }
+    if (!psDBTransaction(config->dbh)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
     for (long i = 0; i < psArrayLength(output); i++) {
         psMetadata *row = output->data[i];
@@ -776 +784 @@
         psS64 magic_ds_id = psMetadataLookupS64(NULL, row, "magic_ds_id");
 
-        // if requested, set stageRun.magicked
+        // if re_place, set stageRun.magicked
+        bool setmagicked = psMetadataLookupBool(NULL, row, "re_place");
         if (setmagicked && !setRunMagicked(config, magic_ds_id)) {
             psError(PS_ERR_UNKNOWN, false, "failed to change stageRun.magicked for magic_ds_id: %" PRId64,
                 magic_ds_id);
+            if (!psDBRollback(config->dbh)) {
+                psError(PS_ERR_UNKNOWN, false, "database error");
+            }
             return false;
         }
@@ -788 +800 @@
                 magic_ds_id);
             psFree(output);
+            if (!psDBRollback(config->dbh)) {
+                psError(PS_ERR_UNKNOWN, false, "database error");
+            }
             return false;
         }
     }
-
+    if (!psDBCommit(config->dbh)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
 
     return true;
@@ -833 +851 @@
     return true;
 }
+
 static bool completedrevertMode(pxConfig *config)
 {

trunk/ippTools/src/magicdstool.h

@@ -30 +30 @@
     MAGICDSTOOL_MODE_TODESTREAK,
     MAGICDSTOOL_MODE_ADDDESTREAKEDFILE,
+    MAGICDSTOOL_MODE_ADVANCERUN,
     MAGICDSTOOL_MODE_REVERTDESTREAKEDFILE,
     MAGICDSTOOL_MODE_GETSKYCELLS,

trunk/ippTools/src/magicdstoolConfig.c

@@ -147 +147 @@
     psMetadataAddU64(completedrevertArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0);
 
+    // -advancerun
+    psMetadata *advancerunArgs = psMetadataAlloc();
+    psMetadataAddS64(advancerunArgs, PS_LIST_TAIL, "-magic_ds_id", 0, "search by magic Destreak ID", 0);
+    psMetadataAddStr(advancerunArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "define label", NULL);
+    psMetadataAddU64(advancerunArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0);
+
     psFree(now);
 
@@ -162 +168 @@
     PXOPT_ADD_MODE("-adddestreakedfile",   "add a de-streaked file",
                     MAGICDSTOOL_MODE_ADDDESTREAKEDFILE, adddestreakedfileArgs);
+    PXOPT_ADD_MODE("-advancerun", "change state for runs that have finished destrreaking",
+                    MAGICDSTOOL_MODE_ADVANCERUN, advancerunArgs);
     PXOPT_ADD_MODE("-revertdestreakedfile", " revert a faulted de-streaked file",
                     MAGICDSTOOL_MODE_REVERTDESTREAKEDFILE, revertdestreakedfileArgs);
@@ -174 +182 @@
                     MAGICDSTOOL_MODE_COMPLETEDREVERT, completedrevertArgs);
 
+
     if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) {
         psError(PS_ERR_UNKNOWN, true, "option parsing failed");