Changeset 27840 for branches/simtest_nebulous_branches/ippTasks/rcserver.pro

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• ippTasks/rcserver.pro (modified) (11 diffs)

branches/simtest_nebulous_branches/ippTasks/rcserver.pro

@@ -4 +4 @@
 check.globals
 
-#$LOGSUBDIR = $LOGDIR/rcserver
+$LOGSUBDIR = $LOGDIR/rcserver
 mkdir $LOGSUBDIR
 
 ### Initialise the books containing the tasks to do
 book init rcPendingFS
-book init rcPendingDest
 
 ### Database lists
 $rcPendingFS_DB = 0
-$rcPendingDest_DB = 0
 
 ### Check status of tasks
 macro rcserver.status
   book listbook rcPendingFS
-  book listbook rcPendingDest
 end
 
@@ -24 +21 @@
 macro rcserver.reset
   book init rcPendingFS
-  book init rcPendingDest
 end
 
@@ -35 +31 @@
     active true
   end
-  task rcserver.checkstatus.load
-    active true
-  end
-  task rcserver.checkstatus.run
-    active true
-  end
 end
 macro rcserver.off
@@ -47 +37 @@
   end
   task rcserver.makefileset.run
-    active false
-  end
-  task rcserver.checkstatus.load
-    active false
-  end
-  task rcserver.checkstatus.run
     active false
   end
@@ -66 +50 @@
 
   stdout NULL
-  stderr $LOGDIR/rcserver.makefileset.load.log
+  stderr $LOGSUBDIR/rcserver.makefileset.load.log
 
   task.exec
@@ -80 +64 @@
     end
     add_poll_args run
+    add_poll_labels run
     command $run
   end
@@ -86 +71 @@
   task.exit    0
     # convert 'stdout' to book format
-    ipptool2book stdout rcPendingFS -key dist_id:prod_id -uniq -setword dbname $options:0 -setword pantaskState INIT
+    ipptool2book stdout rcPendingFS -key dist_id:dest_id -uniq -setword dbname $options:0 -setword pantaskState INIT
     if ($VERBOSE > 2)
       book listbook rcPendingFS
@@ -129 +114 @@
     book getword rcPendingFS $pageName stage -var STAGE
     book getword rcPendingFS $pageName stage_id -var STAGE_ID
+    book getword rcPendingFS $pageName data_group -var DATA_GROUP
+    book getword rcPendingFS $pageName filter -var FILTER
     book getword rcPendingFS $pageName dist_dir -var DIST_DIR
-#    book getword rcPendingFS $pageName clean -var CLEAN
-    book getword rcPendingFS $pageName prod_id -var PROD_ID
+    book getword rcPendingFS $pageName dest_id -var DEST_ID
     book getword rcPendingFS $pageName product_name -var PRODUCT_NAME
     book getword rcPendingFS $pageName ds_dbhost -var DS_DBHOST
@@ -137 +123 @@
     book getword rcPendingFS $pageName dbname -var DBNAME
 
-#    set.host.for.camera $CAMERA $MAGIC_ID
-#    set.workdir.by.camera $CAMERA $MAGIC_ID $WORKDIR_TEMPLATE $default_host WORKDIR
     host anyhost
 
-    sprintf logfile "%s/makefs.%s.%s.log" $DIST_DIR $DIST_ID $PROD_ID
+    sprintf logfile "%s/makefs.%s.%s.log" $DIST_DIR $DIST_ID $DEST_ID
     stdout $logfile
     stderr $logfile
@@ -147 +131 @@
     book setword rcPendingFS $pageName pantaskState RUN
 
-    $run = dist_make_fileset.pl --dist_id $DIST_ID --target_id $TARGET_ID --stage $STAGE --stage_id $STAGE_ID --prod_id $PROD_ID --product_name $PRODUCT_NAME  --ds_dbhost $DS_DBHOST --ds_dbname $DS_DBNAME --dist_dir $DIST_DIR
+    $run = dist_make_fileset.pl --dist_id $DIST_ID --target_id $TARGET_ID --stage $STAGE --stage_id $STAGE_ID --data_group $DATA_GROUP --filter $FILTER --dest_id $DEST_ID --product_name $PRODUCT_NAME  --ds_dbhost $DS_DBHOST --ds_dbname $DS_DBNAME --dist_dir $DIST_DIR
 
     add_standard_args run
@@ -172 +156 @@
   end
 end
-
-
-task           rcserver.checkstatus.load
-  host         local
-
-  periods      -poll $LOADPOLL
-#  periods      -exec $LOADEXEC
-  periods      -exec 20
-  periods      -timeout 30
-  npending     1
-
-  stdout NULL
-  stderr $LOGDIR/rcserver.checkstatus.load.log
-
-  task.exec
-    $run = disttool -pendingdest
-    if ($DB:n == 0)
-      option DEFAULT
-    else
-      # save the DB name for the exit tasks
-      option $DB:$rcPendingDest_DB
-      $run = $run -dbname $DB:$rcPendingDest_DB
-      $rcPendingDest_DB ++
-      if ($rcPendingDest_DB >= $DB:n) set rcPendingDest_DB = 0
-    end
-    add_poll_args run
-    command $run
-  end
-
-  # success
-  task.exit    0
-    # convert 'stdout' to book format
-    ipptool2book stdout rcPendingDest -key dest_id -uniq -setword dbname $options:0 -setword pantaskState INIT
-    if ($VERBOSE > 2)
-      book listbook rcPendingDest
-    end
-
-    # delete existing entries in the appropriate pantaskStates
-    process_cleanup rcPendingDest
-  end
-
-  # locked list
-  task.exit    default
-    showcommand failure
-  end
-
-  # operation times out?
-  task.exit    timeout
-    showcommand timeout
-  end
-end
-
-task           rcserver.checkstatus.run
-  periods      -poll $RUNPOLL
-  periods      -exec $RUNEXEC
-  periods      -timeout 60
-
-  periods      -exec 20
-
-  task.exec
-    book npages rcPendingDest -var N
-    if ($N == 0) break
-    if ($NETWORK == 0) break
-    
-    # look for new components to process (pantaskState == INIT)
-    book getpage rcPendingDest 0 -var pageName -key pantaskState INIT
-    if ("$pageName" == "NULL") break
-
-    stdout NULL
-    stderr $LOGDIR/rcserver.checkstatus.run.log
-
-    book setword rcPendingDest $pageName pantaskState RUN
-    book getword rcPendingDest $pageName dest_id -var DEST_ID
-    book getword rcPendingDest $pageName prod_id -var PROD_ID
-    book getword rcPendingDest $pageName status_uri -var STATUS_URI
-    book getword rcPendingDest $pageName last_fileset -var LAST_FILESET
-    book getword rcPendingDest $pageName dbname -var DBNAME
-
-    host anyhost
-
-    $run = rcserver_checkstatus.pl --dest_id $DEST_ID --prod_id $PROD_ID --status_uri $STATUS_URI --last_fileset $LAST_FILESET
-    add_standard_args run
-
-    # save the pageName for future reference below
-    options $pageName
-
-    # create the command line
-    if ($VERBOSE > 1)
-      echo command $run
-    end
-    command $run
-  end
-
-  # default exit status
-  task.exit    default
-    process_exit rcPendingDest $options:0 $JOB_STATUS
-  end
-
-  # operation timed out?
-  task.exit    timeout
-    showcommand timeout
-    book setword rcPendingDest $options:0 pantaskState TIMEOUT
-  end
-end
-