svn merge -r22332:22405 https://eris.llnl.gov/svn/slurm/branches/slurm-2.2

NEWS

@@ -79,6 +79,8 @@ documents those changes that are of interest to users and admins.
     job is in a pending state, then send the request directly to the slurmctld
     daemon and do not attempt to send the request to slurmd daemons, which are
     not running the job anyway.
+ -- In slurmctld, properly set the up_node_bitmap when setting it's state to
+    IDLE (in case the previous node state was DOWN).
 
 * Changes in SLURM 2.2.1
 ========================

doc/man/man1/salloc.1

@@ -479,8 +479,10 @@ will distribute those tasks to the nodes with tasks one and four on
 the first node, task two on the second node, and task three on the
 third node. 
 Note that when SelectType is select/cons_res the same number of CPUs
-may not be allocated on each node. Distribution will be round\-robin
-among all the nodes with CPUs yet to be allocated.
+may not be allocated on each node with the \-n (\-\-ntasks) option. 
+Distribution will be round\-robin among all the nodes with CPUs yet to 
+be assigned to tasks. If you want the same number of CPUs allocated on 
+all nodes, use the \-\-ntasks\-per\-node option.
 Cyclic distribution is the default behavior if the number
 of tasks is no larger than the number of allocated nodes.
 .TP

doc/man/man1/sbatch.1

@@ -538,8 +538,10 @@ will distribute those tasks to the nodes with tasks one and four on
 the first node, task two on the second node, and task three on the
 third node. 
 Note that when SelectType is select/cons_res the same number of CPUs
-may not be allocated on each node. Distribution will be round\-robin
-among all the nodes with CPUs yet to be allocated.
+may not be allocated on each node with the \-n (\-\-ntasks) option. 
+Distribution will be round\-robin among all the nodes with CPUs yet to 
+be assigned to tasks. If you want the same number of CPUs allocated on 
+all nodes, use the \-\-ntasks\-per\-node option.
 Cyclic distribution is the default behavior if the number
 of tasks is no larger than the number of allocated nodes.
 .TP

doc/man/man1/srun.1

@@ -535,8 +535,10 @@ will distribute those tasks to the nodes with tasks one and four on
 the first node, task two on the second node, and task three on the
 third node. 
 Note that when SelectType is select/cons_res the same number of CPUs
-may not be allocated on each node. Distribution will be round\-robin
-among all the nodes with CPUs yet to be allocated.
+may not be allocated on each node with the \-n (\-\-ntasks) option. 
+Distribution will be round\-robin among all the nodes with CPUs yet to 
+be assigned to tasks. If you want the same number of CPUs allocated on 
+all nodes, use the \-\-ntasks\-per\-node option.
 Cyclic distribution is the default behavior if the number
 of tasks is no larger than the number of allocated nodes.
 .TP

src/slurmctld/node_mgr.c

@@ -2634,8 +2634,9 @@ void make_node_idle(struct node_record *node_ptr,
 		   (node_ptr->run_job_cnt == 0) &&
 		   (node_ptr->comp_job_cnt == 0)) {
 		node_ptr->node_state = NODE_STATE_IDLE | node_flags;
-		bit_set(idle_node_bitmap, inx);
 		bit_clear(avail_node_bitmap, inx);
+		bit_set(idle_node_bitmap, inx);
+		bit_set(up_node_bitmap, inx);
 		debug3("make_node_idle: Node %s is DRAINED",
 		       node_ptr->name);
 		node_ptr->last_idle = now;
@@ -2645,8 +2646,13 @@ void make_node_idle(struct node_record *node_ptr,
 						slurm_get_slurm_user_id());
 	} else if (node_ptr->run_job_cnt) {
 		node_ptr->node_state = NODE_STATE_ALLOCATED | node_flags;
+		if (!IS_NODE_NO_RESPOND(node_ptr))
+			bit_set(avail_node_bitmap, inx);
+		bit_set(up_node_bitmap, inx);
 	} else {
 		node_ptr->node_state = NODE_STATE_IDLE | node_flags;
+		if (!IS_NODE_NO_RESPOND(node_ptr))
+			bit_set(avail_node_bitmap, inx);
 		if (!IS_NODE_NO_RESPOND(node_ptr) &&
 		    !IS_NODE_COMPLETING(node_ptr))
 			bit_set(idle_node_bitmap, inx);