jobutils: More robust return code determination

sawenzel · sawenzel · commit 8b5e823f4d5e · 2021-05-03T09:43:59.000+02:00
Sometimes the bash wait falsely claims "PID" not a child
of this shell.
This commit is working around this issue.
diff --git a/Utilities/Tools/jobutils.sh b/Utilities/Tools/jobutils.sh
@@ -111,7 +111,7 @@ taskwrapper() {
   # the command might be a complex block: For the timing measurement below
   # it is better to execute this as a script
   SCRIPTNAME="${logfile}_tmp.sh"
-  echo "${command}" > ${SCRIPTNAME}
+  echo "${command}; echo \"TASK-EXIT-CODE: $?\"" > ${SCRIPTNAME}
   chmod +x ${SCRIPTNAME}
 
   # this gives some possibility to customize the wrapper
@@ -372,9 +372,9 @@ taskwrapper() {
 
   # wait for PID and fetch return code
   # ?? should directly exit here?
-  wait $PID
-  # return code
-  RC=$?
+  wait $PID || QUERY_RC_FROM_LOG="ON"
+  # query return code from log (seems to be safer as sometimes the wait issues "PID" not a child of this shell)
+  RC=$(grep "TASK-EXIT-CODE:" ${logfile} | awk '//{print $2}')
   RC_ACUM=$((RC_ACUM+RC))
   if [ "${RC}" -eq "0" ]; then
     if [ ! "${JOBUTILS_JOB_SKIPCREATEDONE}" ]; then
