Skip to content

Commit c60da1c

Browse files
committed
BF: CS-1505 prolog and epilog doing output to stdout/stderr can fail for qrsh job
1 parent 28e91c7 commit c60da1c

File tree

5 files changed

+404
-394
lines changed

5 files changed

+404
-394
lines changed

source/daemons/execd/reaper_execd.cc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -567,8 +567,7 @@ static int clean_up_job(lListElem *jr, int failed, int shepherd_exit_status,
567567
ERROR(MSG_JOB_CANTREADERRORFILEFORJOBXY_S, job_get_id_string(job_id, ja_task_id, pe_task_id, &id_dstring));
568568
}
569569
FCLOSE_IGNORE_ERROR(fp);
570-
}
571-
else {
570+
} else {
572571
ERROR(MSG_FILE_NOOPEN_SS, sge_dstring_get_string(&fname), strerror(errno));
573572
/* There is no error file. */
574573
}
@@ -656,8 +655,7 @@ static int clean_up_job(lListElem *jr, int failed, int shepherd_exit_status,
656655
if (!fscanf(fp, sge_u32 , &job_pid))
657656
job_pid = 0;
658657
FCLOSE_IGNORE_ERROR(fp);
659-
}
660-
else {
658+
} else {
661659
job_pid = 0;
662660
ERROR(MSG_JOB_CANTOPENJOBPIDFILEFORJOBXY_S, job_get_id_string(job_id, ja_task_id, pe_task_id, &id_dstring));
663661
}

0 commit comments

Comments
 (0)