Changeset 38587

Timestamp:

Jul 14, 2015, 2:02:38 PM (11 years ago)

Author:

bills

Message:

from trunk: Add task to automatically queue images updated for postage stamp requests
to be cleaned

Location:

tags/ipp-20141024

Files:

• ippTasks/pstamp.pro (modified) (2 diffs, 1 prop)
• ippTools/share/pstamptool_pendingdependent.sql (modified) (1 diff, 1 prop)
• ippTools/src/pstamptool.c (modified) (3 diffs, 1 prop)
• ippTools/src/pstamptoolConfig.c (modified) (2 diffs, 1 prop)
• pstamp/scripts/Makefile.am (modified) (1 diff)
• pstamp/scripts/pstamp_queue_update_cleanup.pl (added)

tags/ipp-20141024/ippTasks/pstamp.pro

@@ -18 +18 @@
 $pstampCleanup_DB = 0
 $pstampStopFaulted_DB = 0
+$pstampQCleanup_DB = 0
 
 # give up on dependents with fault_count >= $PSTAMP_MAX_FAULT_COUNT
@@ -1212 +1213 @@
     end
 end
+
+task pstamp.queue.update.cleanup
+    host        local
+    trange      22:00:00 23:59:59 -nmax 2
+    periods     -poll $RUNPOLL
+    periods     -exec 3600
+    periods     -timeout 120
+    npending    1
+
+    task.exec
+        stdout NULL
+        stderr $LOGSUBDIR/pstamp.queue.update.cleanup.log
+
+        $DBNAME = $DB:$pstampQCleanup_DB
+        $pstampQCleanup_DB++
+        if ($pstampQCleanup_DB >= $DB:n) set pstampQCleanup_DB = 0
+
+        $run = pstamp_queue_update_cleanup.pl  -$PS_DBSERVER --imagedb gpc1 --label ps_ud%
+        add_standard_args run
+        echo $run
+        command $run
+    end
+
+    task.exit $EXIT_SUCCESS
+        # echo nothing to do
+    end
+
+    task.exit   default
+        showcommand failure
+    end
+
+    task.exit   crash
+        showcommand crash
+    end
+
+    task.exit   timeout
+        showcommand timeout
+    end
+end

tags/ipp-20141024/ippTools/share/pstamptool_pendingdependent.sql

@@ -10 +10 @@
 LEFT JOIN Label ON pstampRequest.label = Label.label
 WHERE pstampDependent.state = 'new'
-    AND pstampDependent.fault = 0
     AND pstampJob.state = 'run'
     AND pstampRequest.state = 'run'

tags/ipp-20141024/ippTools/src/pstamptool.c

@@ -467 +467 @@
     PXOPT_COPY_STR(config->args, where, "-username", "username", "==");
     PXOPT_COPY_STR(config->args, where, "-state", "state", "==");
+    PXOPT_COPY_STR(config->args, where, "-label", "label", "LIKE");
 
     PXOPT_LOOKUP_U64(limit,   config->args, "-limit",  false, false);
@@ -1434 +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");
@@ -1441 +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"

tags/ipp-20141024/ippTools/src/pstamptoolConfig.c

@@ -90 +90 @@
     psMetadataAddStr(listreqArgs, PS_LIST_TAIL, "-name", 0,              "list by name", NULL);
     psMetadataAddStr(listreqArgs, PS_LIST_TAIL, "-username", 0,          "list by user name", NULL);
-    psMetadataAddStr(listreqArgs, PS_LIST_TAIL, "-state", 0,              "list by state", NULL);
+    psMetadataAddStr(listreqArgs, PS_LIST_TAIL, "-state", 0,             "list by state", NULL);
+    psMetadataAddStr(listreqArgs, PS_LIST_TAIL, "-label", 0,             "list by label", NULL);
     psMetadataAddS64(listreqArgs, PS_LIST_TAIL, "-not_req_id", 0,        "req_id to not list", 0);
     psMetadataAddU64(listreqArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
@@ -252 +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);

tags/ipp-20141024/pstamp/scripts/Makefile.am

@@ -13 +13 @@
         pstamp_queue_cleanup.pl \
         pstamp_queue_requests.pl \
+        pstamp_queue_update_cleanup.pl \
         pstamp_request_file \
         pstamp_results_file.pl \