From 6b0a14f2f2047d673c9831f07e3c5d8b5e811135 Mon Sep 17 00:00:00 2001 From: marian Date: Mon, 14 Dec 2009 17:08:07 +0000 Subject: [PATCH] Minor changes: 1. Kill zombie jobs 2. Decrease the time limits --- TPC/scripts/runTrainBatch.sh | 5 +-- TPC/scripts/tpcCalibTrain.sh | 70 ++++++++++++++++++++---------------- 2 files changed, 43 insertions(+), 32 deletions(-) diff --git a/TPC/scripts/runTrainBatch.sh b/TPC/scripts/runTrainBatch.sh index aa28138f3e3..2357eefcc58 100644 --- a/TPC/scripts/runTrainBatch.sh +++ b/TPC/scripts/runTrainBatch.sh @@ -55,7 +55,7 @@ cat */esd*.txt.Good > esdGood.txt ################################################################## bgroup=/recalib/`pwd | xargs basename` bgadd $bgroup -$ALICE_ROOT/TPC/scripts/submitCalib.sh run.list "alice-t3 -g $bgroup" 20 +$ALICE_ROOT/TPC/scripts/submitCalib.sh run.list "alice-t3 -g $bgroup -c 3:00 " 20 #$ALICE_ROOT/TPC/scripts/submitCalib.sh run85034.list alice-t3 2 #$ALICE_ROOT/TPC/scripts/submitCalib.sh run85034.list alice-t3 5 #$ALICE_ROOT/TPC/scripts/submitCalib.sh run90000.list alice-t3 10 @@ -89,7 +89,7 @@ $ALICE_ROOT/TPC/scripts/submitMerging.sh run.list "alice-t3_8h -c 0:10" $bgroup ################################################################## bgroup=/recalib/`pwd | xargs basename` bgadd $bgroup -$ALICE_ROOT/TPC/scripts/resubmitMissing.sh run.list "alice-t3 -c 3:00 -g $bgroup" 10 +$ALICE_ROOT/TPC/scripts/resubmitMissing.sh run.list "alice-t3 -c 3:00 -g $bgroup" 5 # # #$ALICE_ROOT/TPC/scripts/resubmitMissing.sh runLaser.list alice-t3 5 @@ -100,6 +100,7 @@ $ALICE_ROOT/TPC/scripts/resubmitMissing.sh run.list "alice-t3 -c 3:00 -g $bgro # 7. Merge separatelly sub run list ################################################################## +$ALICE_ROOT/TPC/scripts/mergeCalibRun.sh run.list $ALICE_ROOT/TPC/scripts/mergeCalibRun.sh runMag05.list $ALICE_ROOT/TPC/scripts/mergeCalibRun.sh runMag02.list $ALICE_ROOT/TPC/scripts/mergeCalibRun.sh runMag0.list diff --git a/TPC/scripts/tpcCalibTrain.sh b/TPC/scripts/tpcCalibTrain.sh index 6188f647b0e..d7875a6e915 100755 --- a/TPC/scripts/tpcCalibTrain.sh +++ b/TPC/scripts/tpcCalibTrain.sh @@ -4,13 +4,14 @@ # 2 - number of chunks processed # 3 - cosmic or collisions # Example: -# source /usr/local/grid/AliRoot/HEAD0108/TPC/scripts/tpcCalibTrain.sh `pwd` +# /usr/local/grid/AliRoot/HEAD0108/TPC/scripts/tpcCalibTrain.sh `pwd` 20 0 >train.log # source /lustre/alice/marin/soft64/AliRoot/v4-17-Rev-18/TPC/scripts/tpcCalibTrain.sh `pwd` # work directory for test /lustre/alice/marin/rec/testRec1 -export balice=/lustre/alice/marin/soft64/setvar0417rev20.sh +export balice=/u/miranov/.balice +#export balice=/lustre/alice/marin/soft64/setvar0417rev20.sh #export balice=/lustre/alice/marin/soft64/setvartrunk021209.sh source $balice export aliensetup=$HOME/alienSetup.sh @@ -28,7 +29,7 @@ export isCosmic=0 if [ $# -eq 3 ]; then isCosmic=$3 fi -echo IsComic $isCosmic +echo IsCosmic $isCosmic @@ -55,9 +56,9 @@ fi; # Make directories # cd $workdir -chgrp -R alice $workdir -chmod -R g+rwx $workdir -chmod -R o+rx $workdir +#chgrp -R alice $workdir +#chmod -R g+rwx $workdir +#chmod -R o+rx $workdir mkdirhier $workdir/calibNoDrift mkdirhier $workdir/calibNoRefit mkdirhier $workdir/calibQA @@ -104,6 +105,7 @@ $ALICE_ROOT/TPC/scripts/makeWorkspace.sh run.list bgroupNoDrift=/recalib/`pwd | xargs basename` bgadd $bgroupNoDrift echo $bgroupNoDrift +bkill -g $bgroupNoDrift -r 0 $ALICE_ROOT/TPC/scripts/resubmitMissing.sh run.list "alice-t3 -c 3:00 -g $bgroupNoDrift " $nChunks nJobsNoDriftSub=`bjobs -W | grep submitCalibJob.sh | grep -c calibNoDrift` @@ -120,6 +122,7 @@ $ALICE_ROOT/TPC/scripts/makeWorkspace.sh run.list bgroupNoRefit=/recalib/`pwd | xargs basename` bgadd $bgroupNoRefit echo $bgroupNoRefit +bkill -g $bgroupNoRefit -r 0 $ALICE_ROOT/TPC/scripts/resubmitMissing.sh run.list "alice-t3 -c 3:00 -g $bgroupNoRefit " $nChunks nJobsNoRefitSub=`bjobs -W | grep submitCalibJob.sh | grep -c calibNoRefit` @@ -133,7 +136,7 @@ nJobsNoRefitRun=`bjobs -W | grep submitCalibJob.sh | grep -c calibNoRefit` -export totalTime=5400 +export totalTime=1800 export timeSleep=60 export restTime=$totalTime @@ -166,8 +169,8 @@ while [ $restTime -gt 0 ];do let restTime=restTime-timeSleep - if [ $ratioNoDriftRunSub -le 10 ]; then - if [ $ratioNoRefitRunSub -le 10 ]; then + if [ $ratioNoDriftRunSub -le 4 ]; then + if [ $ratioNoRefitRunSub -le 4 ]; then let restTime=0 fi fi @@ -186,19 +189,21 @@ cd $workdir/calibNoDrift bgroupMgNoDrift=/mergecalib/`pwd | xargs basename` bgadd $bgroupMgNoDrift echo $bgroupMgNoDrift +bkill -g $bgroupMgNoDrift -r 0 $ALICE_ROOT/TPC/scripts/submitMerging.sh runMissing.list "alice-t3_8h -c 3:00" "$bgroupMgNoDrift" cd $workdir/calibNoRefit bgroupMgNoRefit=/mergecalib/`pwd | xargs basename` bgadd $bgroupMgNoRefit echo $bgroupMgNoRefit +bkill -g $bgroupMgNoRefit -r 0 $ALICE_ROOT/TPC/scripts/submitMerging.sh runMissing.list "alice-t3_8h -c 3:00" "$bgroupMgNoRefit" nJobsNoDriftMergeSub=`bjobs -W | grep -c CalibFileMerger` nJobsNoDriftMergeRun=`bjobs -W | grep -c CalibFileMerger` -export totalTime=3600 +export totalTime=1800 export timeSleep=60 export restTime=$totalTime @@ -219,7 +224,7 @@ while [ $restTime -gt 0 ];do let restTime=restTime-timeSleep - if [ $ratioNoDriftMergeRunSub -le 10 ]; then + if [ $ratioNoDriftMergeRunSub -le 4 ]; then let restTime=0 fi @@ -277,7 +282,8 @@ runL=$(echo $runLow | sed 's|^0*||') runH=$(echo $runHig | sed 's|^0*||') aliroot -x -q $ALICE_ROOT/TPC/CalibMacros/MakeOCDB.C\($runL,$runH,\"mergerun.list/CalibObjectsTrain1.root\"\) - +cd $workdir/calibNoRefit +aliroot -x -q $ALICE_ROOT/TPC/CalibMacros/MakeOCDB.C\($runL,$runH,\"mergerun.list/CalibObjectsTrain1.root\"\) @@ -286,6 +292,7 @@ $ALICE_ROOT/TPC/scripts/makeWorkspace.sh run.list bgroupQA=/recalib/`pwd | xargs basename` bgadd $bgroupQA echo $bgroupQA +bkill -g $bgroupQA -r 0 $ALICE_ROOT/TPC/scripts/resubmitMissing.sh run.list "alice-t3 -c 3:00 -g $bgroupQA " $nChunks nJobsQASub=`bjobs -W | grep submitCalibJob.sh | grep -c calibQA` @@ -297,7 +304,7 @@ nJobsQARun=`bjobs -W | grep submitCalibJob.sh | grep -c calibQA` -export totalTime=5400 +export totalTime=1800 export timeSleep=60 export restTime=$totalTime @@ -318,7 +325,7 @@ while [ $restTime -gt 0 ];do let restTime=restTime-timeSleep - if [ $ratioQARunSub -le 10 ]; then + if [ $ratioQARunSub -le 4 ]; then let restTime=0 fi @@ -340,6 +347,7 @@ cd $workdir/calibQA bgroupMgQA=/mergecalibQA/`pwd | xargs basename` bgadd $bgroupMgQA echo $bgroupMgQA +bkill -g $bgroupQA -r 0 $ALICE_ROOT/TPC/scripts/submitMerging.sh runMissing.list "alice-t3_8h -c 3:00" "$bgroupMgQA" @@ -352,7 +360,7 @@ nJobsQAMergeSub=`bjobs -W | grep -c CalibFileMerger` nJobsQAMergeRun=`bjobs -W | grep -c CalibFileMerger` -export totalTime=3600 +export totalTime=1800 export timeSleep=60 export restTime=$totalTime @@ -373,7 +381,7 @@ while [ $restTime -gt 0 ];do let restTime=restTime-timeSleep - if [ $ratioQAMergeRunSub -le 10 ]; then + if [ $ratioQAMergeRunSub -le 4 ]; then let restTime=0 fi @@ -404,25 +412,27 @@ echo \##################################### -echo \##################################### -echo Starting validation of calibQA -echo \##################################### - - echo \################################## -echo MakeOCDB in the calibQA directory NEEDS TO BE IMPLEMENTED +echo MakeOCDB in the calibQA directory echo \################################## # Step to be verified -#cd $workdir/calibQA -#test -d OCDB && mv OCDB OCDB.$(date +%y%m%d_%H%M) -#mkdir OCDB +cd $workdir/calibQA +test -d OCDB && mv OCDB OCDB.$(date +%y%m%d_%H%M) +mkdir OCDB -#runLow=$(cat ../lists/run.list | sort | head -1) -#runHig=$(cat ../lists/run.list | sort | tail -1) +runLow=$(cat ../lists/run.list | sort | head -1) +runHig=$(cat ../lists/run.list | sort | tail -1) + + +runL=$(echo $runLow | sed 's|^0*||') +runH=$(echo $runHig | sed 's|^0*||') +aliroot -x -q $ALICE_ROOT/TPC/CalibMacros/MakeOCDB.C\($runL,$runH,\"mergerun.list/CalibObjectsTrain1.root\"\) -#runL=$(echo $runLow | sed 's|^0*||') -#runH=$(echo $runHig | sed 's|^0*||') -#aliroot -x -q $ALICE_ROOT/TPC/CalibMacros/MakeOCDB.C\($runL,$runH,\"mergerun.list/CalibObjectsTrain1.root\"\) + + +echo \##################################### +echo Starting validation of calibQA +echo \##################################### -- 2.43.0