diff --git a/slurm/slurm.h.in b/slurm/slurm.h.in index 939536052534eb8fe46e484464b04f2e9a17687c..90fc39cab0ca2e3293f389d8a992960e1c1e5c0d 100644 --- a/slurm/slurm.h.in +++ b/slurm/slurm.h.in @@ -334,7 +334,6 @@ enum job_state_reason { WAIT_CLEANING, /* If a job is requeued and it is * still cleaning up from the last run. */ WAIT_PROLOG, /* Prolog is running */ - WAIT_SCHED_TIMEOUT, /* Scheduler could not test */ }; enum job_acct_types { diff --git a/src/common/slurm_protocol_defs.c b/src/common/slurm_protocol_defs.c index 952c0e473f56918b63bd3a799e1c352eb5d5e203..43cb5fcff29a257d9643622788a601aceaf876ff 100644 --- a/src/common/slurm_protocol_defs.c +++ b/src/common/slurm_protocol_defs.c @@ -1056,8 +1056,6 @@ extern char *job_reason_string(enum job_state_reason inx) return "BlockFreeAction"; case WAIT_CLEANING: return "Cleaning"; - case WAIT_SCHED_TIMEOUT: - return "SchedTimeout"; default: return "?"; } diff --git a/src/slurmctld/job_scheduler.c b/src/slurmctld/job_scheduler.c index fe27533f9256a8446dfc5ab77f7f538c73dc5d91..f4d2224a5c6535b57d367f3009b05317aeaf3c56 100644 --- a/src/slurmctld/job_scheduler.c +++ b/src/slurmctld/job_scheduler.c @@ -1344,13 +1344,6 @@ next_part: part_ptr = (struct part_record *) if (part_iterator) list_iterator_destroy(part_iterator); } else if (job_queue) { - if (job_ptr && (job_ptr->state_reason == WAIT_NO_REASON)) - job_ptr->state_reason = WAIT_SCHED_TIMEOUT; - while ((job_queue_rec = list_pop(job_queue))) { - job_ptr = job_queue_rec->job_ptr; - if (job_ptr->state_reason == WAIT_NO_REASON) - job_ptr->state_reason = WAIT_SCHED_TIMEOUT; - } FREE_NULL_LIST(job_queue); } xfree(sched_part_ptr);