From 174281e2fc2baad5c1d79b710ad0ea07deec4a20 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Tue, 9 Aug 2016 09:30:21 -0600
Subject: [PATCH] EnforcePartLimit logic fixes
Correction to commit b45a55bcc3e0c9408f20f6f731e100db642bfe46
but 2920
---
src/slurmctld/job_mgr.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c
index 0ff420447cb..e933c82114e 100644
--- a/src/slurmctld/job_mgr.c
+++ b/src/slurmctld/job_mgr.c
@@ -4072,15 +4072,13 @@ static int _select_nodes_parts(struct job_record *job_ptr, bool test_only,
break;
}
}
-// if ((best_rc == -1) &&
-// ((rc == ESLURM_NODES_BUSY) ||
-// (rc == ESLURM_RESERVATION_BUSY)))
-// best_rc = rc; /* Job can run later */
if (((rc == ESLURM_NODES_BUSY) ||
(rc == ESLURM_RESERVATION_BUSY)) &&
(best_rc == -1) &&
- (slurmctld_conf.enforce_part_limits ==
- PARTITION_ENFORCE_ANY)) {
+ ((slurmctld_conf.enforce_part_limits ==
+ PARTITION_ENFORCE_ANY) ||
+ (slurmctld_conf.enforce_part_limits ==
+ PARTITION_ENFORCE_NONE))) {
if (test_only)
break;
best_rc = rc; /* Keep looking for partition
--
GitLab