diff --git a/NEWS b/NEWS index f19852ef5b4ab0608dfd9604b129689620efc00b..75661d7f6403341f5115ca9624b9c337e814cb74 100644 --- a/NEWS +++ b/NEWS @@ -317,6 +317,8 @@ documents those changes that are of interest to users and administrators. is requested. -- Fix jobcomp/mysql plugin for MariaDB 10+/Mysql 5.6+ to work with reserved work "partition". + -- If requested (scontrol reboot node_name) reboot a node even if it has + an maintenance reservation that is not active yet. * Changes in Slurm 14.03.10 =========================== diff --git a/src/slurmctld/reservation.c b/src/slurmctld/reservation.c index 965d1c5cef5f212a8527a6985acf32e9074ec262..806fd7900891d2baa76cf4e5055b6517c0336402 100644 --- a/src/slurmctld/reservation.c +++ b/src/slurmctld/reservation.c @@ -4587,14 +4587,19 @@ extern bool is_node_in_maint_reservation(int nodenum) bool res = false; ListIterator iter; slurmctld_resv_t *resv_ptr; + time_t t; if (nodenum < 0 || nodenum >= node_record_count || !resv_list) return false; + t = time(NULL); iter = list_iterator_create(resv_list); while ((resv_ptr = (slurmctld_resv_t *) list_next(iter))) { if ((resv_ptr->flags & RESERVE_FLAG_MAINT) == 0) continue; + if (! (t >= resv_ptr->start_time + && t <= resv_ptr->end_time)) + continue; if (bit_test(resv_ptr->node_bitmap, nodenum)) { res = true; break;