From 45cc1422676ef2cf7e48c5da1679a1888a7fd769 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Wed, 28 Mar 2012 11:02:26 -0700
Subject: [PATCH] in GRES logic, validate CPU count matches node configuration
Without this change, an assert can occur when operating bitmaps of differrent sizes
---
src/common/gres.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/common/gres.c b/src/common/gres.c
index 7fb12a300e1..798ef8c91c6 100644
--- a/src/common/gres.c
+++ b/src/common/gres.c
@@ -2779,7 +2779,13 @@ extern int _job_alloc(void *job_gres_data, void *node_gres_data,
node_gres_ptr->topo_gres_bitmap &&
node_gres_ptr->topo_gres_cnt_alloc) {
for (i = 0; i < node_gres_ptr->topo_cnt; i++) {
+ /* Insure that if specific CPUs are associated with
+ * specific GRES and the CPU count matches the
+ * slurmctld configuration that we only use the GRES
+ * on the CPUs that have already been allocated. */
if (core_bitmap &&
+ (bit_size(core_bitmap) ==
+ bit_size(node_gres_ptr->topo_cpus_bitmap[i])) &&
!bit_overlap(core_bitmap,
node_gres_ptr->topo_cpus_bitmap[i]))
continue;
--
GitLab