Skip to content
Snippets Groups Projects
Commit cf3eb9b3 authored by Morris Jette's avatar Morris Jette
Browse files

Merge branch 'slurm-2.3'

parents 6561b484 43936335
No related branches found
No related tags found
No related merge requests found
......@@ -140,6 +140,8 @@ documents those changes that are of interest to users and admins.
Didier Gazen, Laboratoire d'Aerologie.
-- BLUEGENE - fix for not allowing jobs if all midplanes are drained and all
blocks are in an error state.
-- Avoid slurmctld abort due to bad pointer when setting an advanced
reservation MAINT flag if it contains no nodes (only licenses).
* Changes in SLURM 2.3.3
========================
......
......@@ -3356,11 +3356,17 @@ static void _set_nodes_maint(slurmctld_resv_t *resv_ptr, time_t now)
struct node_record *node_ptr;
if (!resv_ptr->node_bitmap) {
error("reservation %s lacks a bitmap", resv_ptr->name);
error("maintenance reservation %s lacks a bitmap",
resv_ptr->name);
return;
}
i_first = bit_ffs(resv_ptr->node_bitmap);
if (i_first < 0) {
error("maintenance reservation %s includes no nodes",
resv_ptr->name);
return;
}
i_last = bit_fls(resv_ptr->node_bitmap);
for (i=i_first; i<=i_last; i++) {
if (!bit_test(resv_ptr->node_bitmap, i))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment