Merge pull request #27492 from adewit/fix-pede-eoscopy-mst

TkAl Millepede: improve file copying and copy error reporting
cms-sw · Jul 12, 2019 · cdba05b · cdba05b
2 parents 302e068 + 240536e
commit cdba05b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/Alignment/MillePedeAlignmentAlgorithm/scripts/mps_check.py b/Alignment/MillePedeAlignmentAlgorithm/scripts/mps_check.py
@@ -58,6 +58,7 @@
     insuffPriv = 0
     quotaspace = 0
     copyerr=0
+    ispede=0
 
     kill_reason = None
     pedeLogErrStr = ""
@@ -106,6 +107,8 @@
                         insuffPriv = 1
                     if re.search(re.compile('Give up doing',re.M), line):
                         copyerr = 1
+                    if re.search(re.compile('Directory content before',re.M),line):
+                        ispede = 1
                     # AP 05.11.2015 Extract cpu-time.
                     # STDOUT doesn't contain NCU anymore. Now KSI2K and HS06 seconds are displayed.
                     # The ncuFactor is calculated from few samples by comparing KSI2K seconds with
@@ -446,7 +449,8 @@
             print(lib.JOBDIR[i],lib.JOBID[i],'Job not ended')
             remark = 'job not ended'
             okStatus = 'FAIL'
-        if copyerr == 1:
+        if copyerr == 1 and ispede!=1:
+            #Copy errors in pede job can occur when a nonexistent file is commented in alignment_merge.py but not in theScript.sh, and in that case is *not* a failure
             print(lib.JOBDIR[i],lib.JOBID[i],'Copy to eos failed')
             remark = 'copy to eos failed'
             okStatus = 'FAIL'

diff --git a/Alignment/MillePedeAlignmentAlgorithm/templates/mps_runPede_rfcp_template.sh b/Alignment/MillePedeAlignmentAlgorithm/templates/mps_runPede_rfcp_template.sh
@@ -58,7 +58,7 @@ trap clean_up HUP INT TERM SEGV USR2 XCPU XFSZ IO
 # a helper function to repeatedly try failing copy commands
 untilSuccess () {
 # trying "${1} ${2} ${3} > /dev/null" until success, if ${4} is a
-# positive number run {1} with -f flag,
+# positive number run {1} with -f flag and using --cksum md5,
 # break after ${5} tries (with four arguments do up to 5 tries).
     if  [[ ${#} -lt 4 || ${#} -gt 5 ]]
     then
@@ -76,7 +76,7 @@ untilSuccess () {
 
     if [[ ${4} -gt 0 ]]
     then 
-        ${1} -f ${2} ${3} > /dev/null
+        ${1} -f --cksum md5 ${2} ${3} > /dev/null
     else 
         ${1} ${2} ${3} > /dev/null
     fi
@@ -86,7 +86,7 @@ untilSuccess () {
         then # ... but not until infinity!
             if [[ ${4} -gt 0 ]]
             then
-                echo ${0}: Give up doing \"${1} -f ${2} ${3} \> /dev/null\".
+                echo ${0}: Give up doing \"${1} -f --cksum md5 ${2} ${3} \> /dev/null\".
                 return 1
             else
                 echo ${0}: Give up doing \"${1} ${2} ${3} \> /dev/null\".
@@ -96,9 +96,9 @@ untilSuccess () {
         TRIES=$((${TRIES}+1))
         if [[ ${4} -gt 0 ]]
         then
-            echo ${0}: WARNING, problems with \"${1} -f ${2} ${3} \> /dev/null\", try again.
+            echo ${0}: WARNING, problems with \"${1} -f --cksum md5 ${2} ${3} \> /dev/null\", try again.
             sleep $((${TRIES}*5)) # for before each wait a litte longer...
-            ${1} -f ${2} ${3} > /dev/null
+            ${1} -f --cksum md5 ${2} ${3} > /dev/null
         else
             echo ${0}: WARNING, problems with \"${1} ${2} ${3} \> /dev/null\", try again.
             sleep $((${TRIES}*5)) # for before each wait a litte longer...
@@ -108,7 +108,7 @@ untilSuccess () {
 
     if [[ ${4} -gt 0 ]]
     then
-        echo successfully executed \"${1} -f ${2} ${3} \> /dev/null\"
+        echo successfully executed \"${1} -f --cksum md5 ${2} ${3} \> /dev/null\"
     else
         echo successfully executed \"${1} ${2} ${3} \> /dev/null\"
     fi