Changeset 41213 for trunk/ippTasks

Timestamp:

Dec 24, 2019, 2:57:20 AM (7 years ago)

Author:

cclin33

Message:

update for addstar tasks

Location:

trunk/ippTasks

Files:

• addstar.pro (modified) (3 diffs)
• minidvodb.pro (modified) (10 diffs)

trunk/ippTasks/addstar.pro

@@ -405 +405 @@
 
   ## we want only a single outstanding addstar job.  
-  host         local
-  npending     1
+#  host         local
+  npending     100
 
   task.exec
@@ -433 +433 @@
     book getword addPendingExp $pageName image_only -var IMAGE_ONLY
     book getword addPendingExp $pageName dbname -var DBNAME
-
+    book getword addPendingExp $pageName dvodbhost  -var DVODBHOST
+
+    host -required $DVODBHOST
 
     # specify choice of remote host based on camera and chip (class_id)
@@ -478 +480 @@
     stderr $LOGDIR/addstar.exp.log
 
-    $run = addstar_run.pl --add_id $ADD_ID --camera $CAMERA --dvodb $DVODB --stage $STAGE --stageroot $STAGEROOT --outroot $outroot --redirect-output
+    $run = addstar_run.pl --add_id $ADD_ID --camera $CAMERA --dvodb $DVODB --stage $STAGE --stageroot $STAGEROOT --outroot $outroot --redirect-output --dvodbhost $DVODBHOST
     if ("$REDUCTION" != "NULL")
       $run = $run --reduction $REDUCTION

trunk/ippTasks/minidvodb.pro

@@ -131 +131 @@
 ## you get no choice - you add all of them in at the same time. you can always turn off the tasks you don't want to run.
 macro add.minidvodb
-  if ($0 != 7)
-    echo "USAGE: add.minidvodb (minidvodb_group) (minidvodb) (dvodb) (interval days) (interval addruns) (camera)"
+  if ($0 != 8)
+    echo "USAGE: add.minidvodb (minidvodb_group) (minidvodb) (dvodb) (interval days) (interval addruns) (camera) (minidvodb_host)"
     break
   end
@@ -145 +145 @@
   book setword MINIDVODB_PREMERGE $1 MINIDVODB_GROUP $1
   book setword MINIDVODB_PREMERGE $1 DVODB $3
-  book setword MINIDVODB_PREMERGE $1 CAMERA $5
+  book setword MINIDVODB_PREMERGE $1 CAMERA $6
   book setword MINIDVODB_PREMERGE $1 STATE PENDING
   #active  
@@ -161 +161 @@
   book setword MINIDVODB_CREATE $1 DVODB_NUM $5
   book setword MINIDVODB_CREATE $1 CAMERA $6  
+  book setword MINIDVODB_CREATE $1 MINIDVODB_HOST $7
   book setword MINIDVODB_CREATE $1 STATE PENDING  
 end
@@ -191 +192 @@
 
 
-$LOADEXEC_MDB = 300
-
-
+$LOADEXEC_MDB = 30
+$LOADPOLL = 2
 
 
@@ -211 +211 @@
     book npages MINIDVODB -var N
     if ($N == 0)
-#      echo "No labels for processing"
+      echo "No labels for processing minidvodb.wait.load"
       break
     endif
@@ -511 +511 @@
 
 task           minidvodb.create
-  host         local
+#  host         local
 
   periods      -poll $LOADPOLL
   periods      -exec $LOADEXEC_MDB
   periods      -timeout 240
-  npending     1
+#  npending     1
 
   stdout NULL
@@ -523 +523 @@
   task.exec
     
- periods      -poll 60
+# periods      -poll 60
 #wait a bit before trying again
 
     book npages MINIDVODB_CREATE -var N
     if ($N == 0)
-#      echo "No labels for processing"
+      echo "No labels for processing minidvodb create"
       break
     endif
@@ -552 +552 @@
     book getword MINIDVODB_CREATE $minidvodb_group DVODB_NUM -var dvodb_num
     book getword MINIDVODB_CREATE $minidvodb_group CAMERA -var camera
-    $run = minidvodb_createdb.pl --camera $camera --outroot $dvodb --dvodb $dvodb --minidvodb $minidvodb --minidvodb_group $minidvodb_group --interval $dvodb_days --num $dvodb_num
+    book getword MINIDVODB_CREATE $minidvodb_group MINIDVODB_HOST -var minidvodbhost
+    $run = minidvodb_createdb.pl --camera $camera --outroot $dvodb --dvodb $dvodb --minidvodb $minidvodb --minidvodb_group $minidvodb_group --interval $dvodb_days --num $dvodb_num --minidvodb_host $minidvodbhost
  
     if ($DB:n == 0)
@@ -593 +594 @@
 
 task           minidvodb.active.load
-  host         local
+#  host         local
 
   periods      -poll $LOADPOLL
   periods      -exec $LOADEXEC_MDB
   periods      -timeout 30
-  npending     1
+#  npending     1
 
   stdout NULL
@@ -606 +607 @@
     book npages MINIDVODB_ACTIVE -var N
     if ($N == 0)
-#      echo "No labels for processing"
+      echo "No labels for processing active.load"
       break
     endif