diff --git a/NEWS b/NEWS index eef7efe620134e451c24fb12389db71ea2441c38..311cbe0aa6779345dda5cee4a1ef9f69976d9448 100644 --- a/NEWS +++ b/NEWS @@ -72,6 +72,8 @@ documents those changes that are of interest to users and administrators. -- Correct RebootProgram logic when executed outside of a maintenance reservation. -- Requeue job if possible when slurmstepd aborts. + -- If a node is down do not set it in power suspend mode, as it could be resumed + and defeat the purpose of being shut down. * Changes in Slurm 14.11.8 ========================== diff --git a/src/slurmctld/power_save.c b/src/slurmctld/power_save.c index 05c11db5b340c1b445d52a285a00209730e07914..26e92adb0191e5a0b22571419e463b4e9fa16696 100644 --- a/src/slurmctld/power_save.c +++ b/src/slurmctld/power_save.c @@ -181,7 +181,7 @@ static void _do_power_work(time_t now) if (run_suspend && (susp_state == 0) && ((suspend_rate == 0) || (suspend_cnt < suspend_rate)) && - (IS_NODE_IDLE(node_ptr) || IS_NODE_DOWN(node_ptr)) && + (IS_NODE_IDLE(node_ptr)) && (node_ptr->sus_job_cnt == 0) && (!IS_NODE_COMPLETING(node_ptr)) && (!IS_NODE_POWER_UP(node_ptr)) &&