Prevent abort if core count of node's in reservation change

src/plugins/sched/backfill/backfill.c

@@ -315,7 +315,7 @@ static int  _try_sched(struct job_record *job_ptr, bitstr_t **avail_bitmap,
 		job_ptr->details->shared = 0;
 		tmp_bitmap = bit_copy(*avail_bitmap);
 
-		if (exc_core_bitmap){
+		if (exc_core_bitmap) {
 			bit_fmt(str, (sizeof(str) - 1), exc_core_bitmap);
 			debug2(" _try_sched with exclude core bitmap: %s",str);
 		}

src/plugins/select/cons_res/job_test.c

@@ -2104,9 +2104,24 @@ extern int cr_job_test(struct job_record *job_ptr, bitstr_t *bitmap,
 	bit_copybits(bitmap, orig_map);
 	bit_copybits(free_cores, avail_cores);
 
+	if (exc_core_bitmap) {
+		int exc_core_size  = bit_size(exc_core_bitmap);
+		int free_core_size = bit_size(free_cores);
+		if (exc_core_size != free_core_size) {
+			/* This would indicate that cores were added to or
+			 * removed from nodes in this reservation when the
+			 * slurmctld daemon restarted with a new slurm.conf
+			 * file. This can result in cores being lost from a
+			 * reservation. */
+			error("Bad core_bitmap size for reservation %s "
+			      "(%d != %d), ignoring core reservation",
+			      job_ptr->resv_name,
+			      exc_core_size, free_core_size);
+			exc_core_bitmap = NULL;	/* Clear local value */
+		}
+	}
 	if (exc_core_bitmap) {
 		char str[100];
-
 		bit_fmt(str, (sizeof(str) - 1), exc_core_bitmap);
 		debug2("excluding cores reserved: %s", str);
 
@@ -2499,7 +2514,7 @@ alloc_job:
 		return error_code;
 
 	/* load memory allocated array */
-	save_mem =details_ptr->pn_min_memory;
+	save_mem = details_ptr->pn_min_memory;
 	if (save_mem & MEM_PER_CPU) {
 		/* memory is per-cpu */
 		save_mem &= (~MEM_PER_CPU);

src/plugins/select/cons_res/select_cons_res.c

@@ -2623,8 +2623,8 @@ bitstr_t *sequential_pick(bitstr_t *avail_bitmap, uint32_t node_cnt,
 
 			if (cores_in_node) {
 				/* Add this node to the final node bitmap */
-				debug2("Reservation using %d cores in "
-				       "node %d", cores_in_node, inx);
+				debug2("Reservation using %d cores in node %d",
+				       cores_in_node, inx);
 				bit_set(sp_avail_bitmap, inx);
 			} else {
 				debug2("Reservation NOT using node %d", inx);