Changeset 38586 for trunk/ippTools/src

Timestamp:

Jul 14, 2015, 1:54:16 PM (11 years ago)

Author:

bills

Message:

Add a task to queue cleanup of images that have been updated for postage stamp requests.
It runs twice a day and discovers whether or not there are any unfinished postage stamp
dependents. If not queues all of the chip, warp, and diff runs in gpc1 database with label like ps_ud%
to be cleaned. If there are outstanding dependents it does not queue the updates since we don't
want to cause problems with the postage stamp jobs that are depending on them.
This should be much better than the formerly manual process which got done whenever Bill happened to think of it.

Location:

trunk/ippTools/src

Files:

• pstamptool.c (modified) (2 diffs)
• pstamptoolConfig.c (modified) (1 diff)

trunk/ippTools/src/pstamptool.c

@@ -1435 +1435 @@
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
+    PXOPT_LOOKUP_BOOL(includeFaulted, config->args, "-includefaulted", false);
 
     psString query = pxDataGet("pstamptool_pendingdependent.sql");
@@ -1442 +1443 @@
     }
 
+    if (!includeFaulted) {
+        psStringAppend(&query, "    AND (pstampDependent.fault = 0)\n");
+    }
+
     if (psListLength(where->list)) {
         psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
-        psStringAppend(&query, " AND %s", whereClause);
+        psStringAppend(&query, "\n    AND %s", whereClause);
         psFree(whereClause);
     }
     psFree(where);
 
-    psStringAppend(&query, " GROUP BY dep_id ORDER BY priority DESC, MIN(req_id), dep_id");
+    psStringAppend(&query, "\nGROUP BY dep_id ORDER BY priority DESC, MIN(req_id), dep_id");
 
     // treat limit == 0 as "no limit"

trunk/ippTools/src/pstamptoolConfig.c

@@ -253 +253 @@
     psMetadataAddStr(pendingdependentArgs, PS_LIST_TAIL, "-rlabel", 0,   "define label for dependent", NULL);
     psMetadataAddStr(pendingdependentArgs, PS_LIST_TAIL, "-imagedb", 0,  "define imagedb for depenent", NULL);
+    psMetadataAddBool(pendingdependentArgs, PS_LIST_TAIL, "-includefaulted", 0,   "include faulted dependents in the output", false);
     psMetadataAddU64(pendingdependentArgs, PS_LIST_TAIL, "-limit",  0,    "limit result set to N items", 0);
     psMetadataAddBool(pendingdependentArgs, PS_LIST_TAIL, "-simple", 0,   "use the simple output format", false);