Changeset 16370

Timestamp:

Feb 8, 2008, 9:34:58 AM (18 years ago)

Author:

eugene

Message:

more sensible timeouts, add compress option, working on dsget error status

File:

• trunk/ippTasks/summit.copy.pro (modified) (6 diffs)

trunk/ippTasks/summit.copy.pro

@@ -75 +75 @@
 
     # timeout shorter than exec so jobs do not build up
-    periods      -exec     300
-    periods      -poll     100
-    periods      -timeout  600
+    periods      -exec      10
+    periods      -poll       1
+    periods      -timeout   20
     npending     1
 
@@ -100 +100 @@
 # run pzgetexp periodically to populate pzPendingExp in the database (no I/O)
 task pzgetexp
-  # timeout shorter than exec so jobs do not build up
   periods      -exec     10
   periods      -poll     1
-  periods      -timeout  10
+  periods      -timeout  20
   npending      1
   host         local
@@ -153 +152 @@
     host         local
 
-    # timeout shorter than exec so jobs do not build up
     periods      -exec     10
     periods      -poll     1
-    periods      -timeout  10
+    periods      -timeout  20
     npending     1
 
@@ -247 +245 @@
     host         local
 
-    # timeout shorter than exec so jobs do not build up
-    periods      -exec     5
-    periods      -poll     1
-    periods      -timeout  5
+    periods      -exec     10
+    periods      -poll      1
+    periods      -timeout  20
     npending     1
 
@@ -334 +331 @@
         options $pageName $workdir
 
-        $run = dsget --uri $URI --filename $FILENAME --bytes $BYTES 
-        if (("$MD5SUM" != "NULL") && ("$MD5SUM" != "0"))
+        $run = dsget --uri $URI --filename $FILENAME
+        if ($COMPRESS) 
+            $run = $run --compress
+        else
+            $run = $run --bytes $BYTES 
+        end
+        if (("$MD5SUM" != "NULL") && ("$MD5SUM" != "0") && (not($COMPRESS)))
             $run = $run --md5 $MD5SUM
         end
@@ -383 +385 @@
     task.exit default
         showcommand failure
+
+        # get related info from the associated page
+        book getword pzPendingImfile $options:0 exp_name -var EXP_NAME
+        book getword pzPendingImfile $options:0 class -var CLASS
+        book getword pzPendingImfile $options:0 camera -var CAMERA
+        book getword pzPendingImfile $options:0 telescope -var TELESCOPE
+        book getword pzPendingImfile $options:0 class_id -var CLASS_ID
+        book getword pzPendingImfile $options:0 filename -var FILENAME
+
+        # we saved the workdir so we can pass it to pztool
+        $workdir = $options:1
+
+        # update the database with the fault state
+        $run = pztool -copydone -exp_name $EXP_NAME -inst $CAMERA -telescope $TELESCOPE -class $CLASS -class_id $CLASS_ID -uri $FILENAME -workdir $workdir -code $JOB_STATUS -end_stage reg
+
+        # create the command line
+        if ($VERBOSE > 1)
+          echo exec $run
+        end
+        exec $run
+
+        # update the pantasks process tables
         process_exit pzPendingImfile $options:0 $JOB_STATUS
     end