Changeset 30676 for branches/eam_branches/ipp-20110213/ippTasks

Timestamp:

Feb 17, 2011, 3:20:07 PM (16 years ago)

Author:

eugene

Message:

merge changes from the trunk

Location:

branches/eam_branches/ipp-20110213/ippTasks

Files:

• destreak.pro (modified) (2 diffs)
• diskbalance.pro (modified) (1 diff)
• dist.pro (modified) (1 diff)
• receive.pro (modified) (2 diffs)

branches/eam_branches/ipp-20110213/ippTasks/destreak.pro

@@ -395 +395 @@
     book getword magicDSToRevert $pageName component -var COMPONENT
     book getword magicDSToRevert $pageName path_base -var PATH_BASE
+    book getword magicDSToRevert $pageName recovery_path_base -var RECOVERY_PATH_BASE
     book getword magicDSToRevert $pageName cam_path_base -var CAM_PATH_BASE
     book getword magicDSToRevert $pageName cam_reduction -var CAM_REDUCTION
@@ -416 +417 @@
     end
 
-    $run = magic_destreak_revert.pl --magic_ds_id $MAGIC_DS_ID --camera $CAMERA --stage $STAGE --stage_id $STAGE_ID --component $COMPONENT --path_base $PATH_BASE --cam_path_base $CAM_PATH_BASE --cam_reduction $CAM_REDUCTION --outroot $OUTROOT --logfile $logfile --replace $REPLACE --bothways $BOTHWAYS --magicked $MAGICKED --run-state $RUN_STATE
+    $run = magic_destreak_revert.pl --magic_ds_id $MAGIC_DS_ID --camera $CAMERA --stage $STAGE --stage_id $STAGE_ID --component $COMPONENT --path_base $PATH_BASE --cam_path_base $CAM_PATH_BASE --cam_reduction $CAM_REDUCTION --outroot $OUTROOT --logfile $logfile --replace $REPLACE --bothways $BOTHWAYS --magicked $MAGICKED --run-state $RUN_STATE --recovery_path_base $RECOVERY_PATH_BASE
 
     add_standard_args run

branches/eam_branches/ipp-20110213/ippTasks/diskbalance.pro

@@ -183 +183 @@
         break
     end
-#    periods -exec 3
+    # Reset the speed if we're doing something
+    periods -exec 0.5
 
     # look for new objects in balancePending

branches/eam_branches/ipp-20110213/ippTasks/dist.pro

@@ -178 +178 @@
   host         local
 
-  periods      -poll 20
-  periods      -exec $LOADEXEC
+  periods      -exec 20
+  periods      -poll $LOADPOLL
   periods      -timeout 300
   npending     1

branches/eam_branches/ipp-20110213/ippTasks/receive.pro

@@ -105 +105 @@
 $receive_Advance_DB = 0
 
+# set this to skip extraction of tarfiles into their destination directories
+$NO_EXTRACT = ""
+macro set.no.extract
+    $NO_EXTRACT = "--no-extract"
+end
+macro clear.no.extract
+    $NO_EXTRACT = ""
+end
+macro show.no.extract
+    echo $NO_EXTRACT
+end
+
 task           receive.source.load
   host         local
@@ -416 +428 @@
     host anyhost
 
-    $run = receive_file.pl --file_id $FILE_ID --source $SOURCE --product $PRODUCT --fileset $FILESET --fileset_id $FILESET_ID --file $FILE --component $COMPONENT --bytes $BYTES --md5 $MD5SUM --workdir $WORKDIR --dirinfo $DIRINFO
+    $run = receive_file.pl --file_id $FILE_ID --source $SOURCE --product $PRODUCT --fileset $FILESET --fileset_id $FILESET_ID --file $FILE --component $COMPONENT --bytes $BYTES --md5 $MD5SUM --workdir $WORKDIR --dirinfo $DIRINFO $NO_EXTRACT
     add_standard_args run