Skip to content

Commit d07d182

Browse files
sawenzeldavidrohr
authored andcommitted
Catch ROOT 'fatal in' / simplify fairmq-shmmonitor usage
* Bring down tasks after ROOT Fatal in events. (see O2-2024) (prevents a hang in DPL until this is treated natively) * simplify usage of fairmq-shmmonitor after bump to FairMQ 1.4.30
1 parent 722d840 commit d07d182

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Utilities/Tools/jobutils.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ taskwrapper() {
177177
-e \"error while setting up workflow\" \
178178
-e \"bus error\" \
179179
-e \"Assertion.*failed\" \
180+
-e \"Fatal in\" \
180181
-e \"There was a crash.\""
181182

182183
grepcommand="grep -H ${pattern} $logfile ${JOBUTILS_JOB_SUPERVISEDFILES} >> encountered_exceptions_list 2>/dev/null"
@@ -219,7 +220,7 @@ taskwrapper() {
219220
if [ "${JOBUTILS_MONITORMEM}" ]; then
220221
if [ "${JOBUTILS_INTERNAL_DPL_SESSION}" ]; then
221222
MAX_FMQ_SHM=${MAX_FMQ_SHM:-0}
222-
text=$(timeout 1 fairmq-shmmonitor --interval 100 -v -s ${JOBUTILS_INTERNAL_DPL_SESSION})
223+
text=$(fairmq-shmmonitor -v -s ${JOBUTILS_INTERNAL_DPL_SESSION})
223224
line=$(echo ${text} | tr '[' '\n[' | grep "^0" | tail -n1)
224225
CURRENT_FMQ_SHM=$(echo ${line} | sed 's/.*used://g')
225226
# echo "current shm ${CURRENT_FMQ_SHM}"

0 commit comments

Comments
 (0)