From 308b743204e47b560535328c481521dc229e8743 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Armin=20Gr=C3=B6=C3=9Flinger?=
<armin.groesslinger@uni-passau.de>
Date: Mon, 16 Sep 2013 15:06:21 -0700
Subject: [PATCH] This fixes the MaxCPUsPerNode partition constraint
for CR_Socket.
---
NEWS | 1 +
src/plugins/select/cons_res/job_test.c | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/NEWS b/NEWS
index 84a6a4249df..2f5417c7feb 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,7 @@ documents those changes that are of interest to users and admins.
-- Add spank/pbs plugin to set a bunch of PBS environment variables.
-- Backported sh5util from master to 2.6 as there are some important
bugfixes and the new item extraction feature.
+ -- select/cons_res - Corect MacCPUsPerNode partition constraint for CR_Socket.
* Changes in Slurm 2.6.2
========================
diff --git a/src/plugins/select/cons_res/job_test.c b/src/plugins/select/cons_res/job_test.c
index 32bd2056479..fe249120ef5 100644
--- a/src/plugins/select/cons_res/job_test.c
+++ b/src/plugins/select/cons_res/job_test.c
@@ -238,9 +238,9 @@ uint16_t _allocate_sockets(struct job_record *job_ptr, bitstr_t *core_map,
used_cores[i] += free_cores[i];
free_cores[i] = 0;
}
- free_cpu_count = free_cores[i] * threads_per_core;
+ free_cpu_count += free_cores[i] * threads_per_core;
if (used_cpu_array[i])
- used_cpu_count = cores_per_socket * threads_per_core;
+ used_cpu_count = used_cores[i] * threads_per_core;
}
xfree(used_cores);
xfree(used_cpu_array);
--
GitLab