Changeset 32694 for branches/eam_branches/ipp-20111110/ippTools

Timestamp:

Nov 17, 2011, 2:02:08 PM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20111110

Files:

• . (modified) (1 prop)
• ippTools/share/bgtool_definechip.sql (modified) (1 diff)
• ippTools/share/camtool_find_pendingimfile.sql (modified) (1 prop)
• ippTools/share/chiptool_dropprocessedimfile_delete.sql (modified) (1 diff)
• ippTools/share/pxadmin_create_tables.sql (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/chiptool.c (modified) (2 diffs)
• ippTools/src/disttool.c (modified) (2 diffs)
• ippTools/src/disttoolConfig.c (modified) (1 diff)
• ippTools/src/magicdstool.c (modified) (5 diffs)
• ippTools/src/magicdstoolConfig.c (modified) (1 diff)
• ippTools/src/magictool.c (modified) (1 prop)

branches/eam_branches/ipp-20111110/ippTools/share/bgtool_definechip.sql

@@ -5 +5 @@
 LEFT JOIN chipBackgroundRun USING(chip_id)
 WHERE chipRun.state = 'full'
-    AND chipRun.magicked > 0 -- require destreaked to stop race condition in destreaking

branches/eam_branches/ipp-20111110/ippTools/share/chiptool_dropprocessedimfile_delete.sql

@@ -2 +2 @@
     USING magicDSRun, magicDSFile, chipRun, chipProcessedImfile
 WHERE chipRun.chip_id = chipProcessedImfile.chip_id
-    AND magicDSRun.stage ='chip' and magicDSRun.stage_id = chipRun.chip_id
-    AND magicDSFile.magic_ds_id = magicDSFile.magic_ds_id
+    AND magicDSRun.stage ='chip'
+    AND magicDSRun.stage_id = chipRun.chip_id
+    AND magicDSRun.magic_ds_id = magicDSFile.magic_ds_id
     AND magicDSFile.component = chipProcessedImfile.class_id

branches/eam_branches/ipp-20111110/ippTools/src/chiptool.c

@@ -885 +885 @@
     }
     psFree(query);
+    int numDeleted = psDBAffectedRows(config->dbh);
+    psLogMsg("chiptool", PS_LOG_INFO, "Deleted %d chipProcessedImfiles", numDeleted);
 
     if (!fault) {
@@ -898 +900 @@
     }
     psFree(query_update);
+    int numUpdated = psDBAffectedRows(config->dbh);
+    psLogMsg("chiptool", PS_LOG_INFO, "Updated %d chipProcessedImfiles", numUpdated);
+
 
     return true;

branches/eam_branches/ipp-20111110/ippTools/src/disttool.c

@@ -141 +141 @@
     PXOPT_LOOKUP_BOOL(use_alternate, config->args, "-use_alternate", false);
     PXOPT_LOOKUP_BOOL(no_magic, config->args, "-no_magic", false);
-    PXOPT_LOOKUP_BOOL(i_am_sure, config->args, "-i_am_sure", false);
     PXOPT_LOOKUP_STR(set_label, config->args, "-set_label", false, false);
     PXOPT_LOOKUP_STR(set_data_group, config->args, "-set_data_group", false, false);
@@ -165 +164 @@
     PXOPT_LOOKUP_STR(dist_group, config->args, "-dist_group", false, false);
 
-    // queuing no_magic runs can be quite dangerous. Require confirmation
-    if (no_magic && !pretend && !i_am_sure) {
-        psError(PXTOOLS_ERR_SYS, true, "-i_am_sure required to queue no_magic distribution runs");
-        return false;
-    }
-   
     if (use_alternate) {
         if (strcmp(stage, "raw")) {

branches/eam_branches/ipp-20111110/ippTools/src/disttoolConfig.c

@@ -49 +49 @@
 
     psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-no_magic", 0, "magic is not needed", false);
-    psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-i_am_sure", 0, "confirmation needed when -no_magic is supplied", false);
     psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-use_alternate", 0, "use alternate inputs", false);
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_label",    0, "define label for run", NULL);

branches/eam_branches/ipp-20111110/ippTools/src/magicdstool.c

@@ -53 +53 @@
 
 static bool setmagicDSRunState(pxConfig *config, psS64 magic_id, psString extraSetString, psMetadata *where, const char *state);
+static bool validDSRunState(const char *state);
 
 # define MODECASE(caseName, func) \
@@ -1212 +1213 @@
 
     psMetadata *where = psMetadataAlloc();
-    // new state (required
-    PXOPT_LOOKUP_STR(new_state, config->args, "-set_state", true, false);
+    // new state
+    PXOPT_LOOKUP_STR(new_state, config->args, "-set_state", false, false);
     // old state (required)
     PXOPT_LOOKUP_STR(state, config->args, "-state", true, false);
@@ -1237 +1238 @@
         if (!strcmp(state, "failed_revert")) {
             new_state = "new";
+        } else if (!strcmp(state, "failed_revert_ud")) {
+            new_state = "update";
         } else if (!strcmp(state, "failed_cleanup")) {
             new_state = "goto_cleaned";
@@ -1243 +1246 @@
             return false;
         }
+    } else {
+        if (!validDSRunState(new_state)) {
+            psError(PS_ERR_UNKNOWN, true, "unexpected value for new state: %s", new_state);
+            return false;
+        }
     }
     if (!p_psDBRunQueryF(config->dbh, query, new_state)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to revert");
+        psError(PS_ERR_UNKNOWN, false, "failed to clear state faults");
         psFree(query);
         return false;
@@ -1403 +1411 @@
           (strcmp(state, "wait") == 0) ||
           (strcmp(state, "failed_revert") == 0) ||
+          (strcmp(state, "failed_revert_ud") == 0) ||
           (strcmp(state, "error_cleaned") == 0) ||
           (strcmp(state, "restored") == 0) ||

branches/eam_branches/ipp-20111110/ippTools/src/magicdstoolConfig.c

@@ -163 +163 @@
     // -clearstatefaults
     psMetadata *clearstatefaultsArgs = psMetadataAlloc();
-    psMetadataAddStr(clearstatefaultsArgs, PS_LIST_TAIL, "-set_state", 0, "new value for state (required)", NULL);
+    psMetadataAddStr(clearstatefaultsArgs, PS_LIST_TAIL, "-set_state", 0, "new value for state", NULL);
     psMetadataAddStr(clearstatefaultsArgs, PS_LIST_TAIL, "-state", 0, "search by state (required)", NULL);
     psMetadataAddS64(clearstatefaultsArgs, PS_LIST_TAIL, "-magic_ds_id", 0, "search by magictool de-streak ID", 0);