From 1a5e19361791a01cb14b6f74b307787d0e449e66 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Fri, 5 Oct 2012 09:49:18 -0700
Subject: [PATCH] Revert commit 5deba75c5174ea72c563bfa95c9ea166be6eaeff
While this change lets gang scheduling happen, it overallocates
resources from different priority partitions when gang scheduling
is not running.
---
NEWS | 2 --
src/plugins/select/cons_res/job_test.c | 13 +++++++++++++
src/plugins/select/serial/job_test.c | 13 +++++++++++++
3 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/NEWS b/NEWS
index 2799eb56dfa..37d2b4b4f2e 100644
--- a/NEWS
+++ b/NEWS
@@ -5,8 +5,6 @@ documents those changes that are of interest to users and admins.
=============================
-- Added Prolog and Epilog Guide (web page). Based upon work by Jason Sollom,
Cray Inc. and used by permission.
- -- Fix bug in allocating resources with Shared=NO and gang scheduling.
- Preemptor was not being scheduled. Fix bugzilla #3.
* Changes in SLURM 2.5.0.pre3
=============================
diff --git a/src/plugins/select/cons_res/job_test.c b/src/plugins/select/cons_res/job_test.c
index 44a80e8afc3..e250086b73d 100644
--- a/src/plugins/select/cons_res/job_test.c
+++ b/src/plugins/select/cons_res/job_test.c
@@ -2165,6 +2165,19 @@ extern int cr_job_test(struct job_record *job_ptr, bitstr_t *bitmap,
}
goto alloc_job;
}
+
+ if (job_node_req == NODE_CR_ONE_ROW) {
+ /* This job CANNOT share CPUs regardless of priority,
+ * so we fail here. Note that Shared=EXCLUSIVE was already
+ * addressed in _verify_node_state() and job preemption
+ * removes jobs from simulated resource allocation map
+ * before this point. */
+ if (select_debug_flags & DEBUG_FLAG_CPU_BIND) {
+ info("cons_res: cr_job_test: test 1 fail - "
+ "no idle resources available");
+ }
+ goto alloc_job;
+ }
if (select_debug_flags & DEBUG_FLAG_CPU_BIND) {
info("cons_res: cr_job_test: test 1 fail - "
"not enough idle resources");
diff --git a/src/plugins/select/serial/job_test.c b/src/plugins/select/serial/job_test.c
index f8ed71a3aa0..eb9a9f75f68 100644
--- a/src/plugins/select/serial/job_test.c
+++ b/src/plugins/select/serial/job_test.c
@@ -600,6 +600,19 @@ extern int cr_job_test(struct job_record *job_ptr, bitstr_t *bitmap, int mode,
}
goto alloc_job;
}
+
+ if (job_node_req == NODE_CR_ONE_ROW) {
+ /* This job CANNOT share CPUs regardless of priority,
+ * so we fail here. Note that Shared=EXCLUSIVE was already
+ * addressed in _verify_node_state() and job preemption
+ * removes jobs from simulated resource allocation map
+ * before this point. */
+ if (select_debug_flags & DEBUG_FLAG_CPU_BIND) {
+ info("select/serial: cr_job_test: test 1 fail - "
+ "no idle resources available");
+ }
+ goto alloc_job;
+ }
if (select_debug_flags & DEBUG_FLAG_CPU_BIND) {
info("select/serial: cr_job_test: test 1 fail - "
"not enough idle resources");
--
GitLab