Index: trunk/ippTasks/pstamp.pro =================================================================== --- trunk/ippTasks/pstamp.pro (revision 27870) +++ trunk/ippTasks/pstamp.pro (revision 27874) @@ -14,4 +14,5 @@ $pstampRev_DB = 0 $pstampDep_DB = 0 +$pstampCleanup_DB = 0 # set PS_DBSERVER if postage stamp database host is not the same as the value for DBSERVER in site.config @@ -30,4 +31,5 @@ book init pstampFinish book init pstampDependent + book init pstampCleanup end @@ -58,7 +60,4 @@ active true end - task pstamp.job.revert - active true - end task pstamp.dependent.load active true @@ -94,5 +93,8 @@ end task pstamp.dependent.load - active true + active false + end + task pstamp.dependent.run + active false end end @@ -105,4 +107,20 @@ macro pstamp.revert.off task pstamp.job.revert + active false + end +end +macro pstamp.cleanup.on + task pstamp.cleanup.load + active true + end + task pstamp.cleanup.run + active true + end +end +macro pstamp.cleanup.off + task pstamp.cleanup.run + active false + end + task pstamp.cleanup.run active false end @@ -157,5 +175,5 @@ task.exec - stdout $LOGSUBDIR/pstamp.request.load.log + stdout NULL stderr $LOGSUBDIR/pstamp.request.load.log $run = pstamptool -pendingreq @@ -200,8 +218,7 @@ periods -exec $RUNEXEC periods -timeout 300 - npending 6 - - task.exec - stdout $LOGSUBDIR/pstamp.request.run.log + + task.exec + stdout NULL stderr $LOGSUBDIR/pstamp.request.run.log book npages pstampRequest -var N @@ -216,9 +233,10 @@ book getword pstampRequest $pageName uri -var URI book getword pstampRequest $pageName ds_outProduct -var PRODUCT + book getword pstampRequest $pageName outdir -var OUTDIR book getword pstampRequest $pageName label -var LABEL host anyhost - $run = pstamp_parser_run.pl --req_id $REQ_ID --uri $URI --product $PRODUCT --label $LABEL --redirect-output + $run = pstamp_parser_run.pl --req_id $REQ_ID --uri $URI --product $PRODUCT --outdir $OUTDIR --label $LABEL --redirect-output add_standard_args run @@ -261,5 +279,5 @@ task.exec - stdout $LOGSUBDIR/pstamp.finish.load.log + stdout NULL stderr $LOGSUBDIR/pstamp.finish.load.log $run = pstamptool -completedreq @@ -306,5 +324,5 @@ task.exec - stdout $LOGSUBDIR/request.finish.run.log + stdout NULL stderr $LOGSUBDIR/request.finish.run.log book npages pstampFinish -var N @@ -321,6 +339,7 @@ book getword pstampFinish $pageName name -var REQ_NAME book getword pstampFinish $pageName outProduct -var PRODUCT - - $run = request_finish.pl --req_id $REQ_ID --req_type $REQ_TYPE --req_file $URI --req_name $REQ_NAME --product $PRODUCT --redirect-output + book getword pstampFinish $pageName outdir -var OUTDIR + + $run = request_finish.pl --req_id $REQ_ID --req_type $REQ_TYPE --req_file $URI --req_name $REQ_NAME --product $PRODUCT --outdir $OUTDIR --redirect-output add_standard_args run @@ -363,5 +382,5 @@ task.exec - stdout $LOGSUBDIR/pstamp.job.load.log + stdout NULL stderr $LOGSUBDIR/pstamp.job.load.log $run = pstamptool -pendingjob @@ -411,5 +430,5 @@ task.exec - stdout $LOGSUBDIR/pstamp.job.run.log + stdout NULL stderr $LOGSUBDIR/pstamp.job.run.log book npages pstampJob -var N @@ -489,5 +508,5 @@ task.exec - stdout $LOGSUBDIR/pstamp.job.revert.log + stdout NULL stderr $LOGSUBDIR/pstamp.job.revert.log $run = pstamptool -revertjob -all @@ -532,5 +551,5 @@ task.exec - stdout $LOGSUBDIR/pstamp.dependent.load.log + stdout NULL stderr $LOGSUBDIR/pstamp.dependent.load.log $run = pstamptool -pendingdependent @@ -660,2 +679,118 @@ end +task pstamp.cleanup.load + host local + + periods -poll $LOADPOLL + periods -exec $LOADEXEC + periods -timeout 300 + npending 1 + + task.exec + stdout NULL + stderr $LOGSUBDIR/pstamp.cleanup.load.log + $run = pstamptool -pendingcleanup + if ($DB:n == 0) + option DEFAULT + else + option $DB:$pstampCleanup_DB + $run = $run $PS_DBSERVER -dbname $DB:$pstampCleanup_DB + $pstampCleanup_DB ++ + if ($pstampCleanup_DB >= $DB:n) set pstampCleanup_DB = 0 + end + add_poll_args run + add_poll_labels run + command $run + end + + task.exit $EXIT_SUCCESS + ipptool2book stdout pstampCleanup -key req_id -uniq -setword dbname $options:0 -setword pantaskState INIT + if ($VERBOSE > 2) + echo starting request + book listbook pstampCleanup + end + + process_cleanup pstampCleanup + end + + task.exit default + showcommand failure + end + + task.exit crash + showcommand crash + end + + task.exit timeout + showcommand timeout + end +end + +task pstamp.cleanup.run + periods -poll $RUNPOLL + periods -exec $RUNEXEC + periods -timeout 300 + # since everything is on one file system keep npending low to avoid + # overloading nfs + + npending 10 + + task.exec + book npages pstampCleanup -var N + if ($N == 0) + periods -exec $RUNEXEC + break + end + periods -exec 0.05 + + book getpage pstampCleanup 0 -var pageName -key pantaskState INIT + if ("$pageName" == "NULL") break + + book setword pstampCleanup $pageName pantaskState RUN + book getword pstampCleanup $pageName req_id -var REQ_ID + book getword pstampCleanup $pageName dbname -var DBNAME + book getword pstampCleanup $pageName name -var NAME + book getword pstampCleanup $pageName outdir -var OUTDIR + book getword pstampCleanup $pageName uri -var URI + book getword pstampCleanup $pageName reqType -var REQTYPE + book getword pstampCleanup $pageName outProduct -var PRODUCT + + # XXX: have the script set this up this + $MYLOGFILE=/data/ippdb02.0/pstamp/work/logs/cleanup.$REQ_ID + stdout $MYLOGFILE + stderr $MYLOGFILE + + host anyhost + + $run = pstamp_cleanup.pl --req_id $REQ_ID --uri $URI --product $PRODUCT --name $NAME --outdir $OUTDIR --reqType $REQTYPE + + add_standard_args run + options $pageName + + if ($VERBOSE > 1) + echo command $run + end + command $run + end + + + task.exit $EXIT_SUCCESS + process_exit pstampCleanup $options:0 $JOB_STATUS + end + + task.exit default + showcommand failure + process_exit pstampCleanup $options:0 $JOB_STATUS + end + + task.exit crash + showcommand crash + book setword pstampCleanup $options:0 pantaskState CRASH + end + + task.exit timeout + showcommand timeout + book setword pstampCleanup $options:0 pantaskState TIMEOUT + end +end +