From f7f6ccc8bfd3396280d423efed30081e7bbe0e79 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Wed, 22 Apr 2009 18:28:20 +0000
Subject: [PATCH] svn merge -r17326:17329
https://eris.llnl.gov/svn/slurm/branches/slurm-1.3
---
src/slurmctld/job_mgr.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c
index c7d92a44e74..1b08ee0cc78 100644
--- a/src/slurmctld/job_mgr.c
+++ b/src/slurmctld/job_mgr.c
@@ -2141,14 +2141,16 @@ extern int job_complete(uint32_t job_id, uid_t uid, bool requeue,
job_ptr->state_reason = FAIL_EXIT_CODE;
xfree(job_ptr->state_desc);
} else if (job_comp_flag && /* job was running */
- (job_ptr->end_time < now)) { /* over time limit */
+ (job_ptr->end_time < now)) { /* over time limit */
job_ptr->job_state = JOB_TIMEOUT | job_comp_flag;
job_ptr->exit_code = MAX(job_ptr->exit_code, 1);
job_ptr->state_reason = FAIL_TIMEOUT;
xfree(job_ptr->state_desc);
- } else
+ } else {
job_ptr->job_state = JOB_COMPLETE | job_comp_flag;
-
+ job_ptr->exit_code = job_return_code;
+ }
+
if (suspended) {
job_ptr->end_time = job_ptr->suspend_time;
job_ptr->tot_sus_time +=
--
GitLab