Revert power_save patches

This reverts commits
7660da9e
5c386455 and
f6c5302b

NEWS

@@ -3,8 +3,6 @@ documents those changes that are of interest to users and administrators.
 
 * Changes in Slurm 14.11.10
 ===========================
- -- 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.
  -- Fix truncation of job reason in squeue.
 
 * Changes in Slurm 14.11.9

src/slurmctld/power_save.c

@@ -181,12 +181,10 @@ 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_IDLE(node_ptr) || IS_NODE_DOWN(node_ptr))	&&
 		    (node_ptr->sus_job_cnt == 0)			&&
 		    (!IS_NODE_COMPLETING(node_ptr))			&&
 		    (!IS_NODE_POWER_UP(node_ptr))			&&
-		    (!IS_NODE_DRAINED(node_ptr)) &&
-		    (!IS_NODE_DRAINING(node_ptr)) &&
 		    (node_ptr->last_idle < (now - idle_time))		&&
 		    ((exc_node_bitmap == NULL) ||
 		     (bit_test(exc_node_bitmap, i) == 0))) {