Merge branch 'slurm-15.08'

NEWS

@@ -46,6 +46,7 @@ documents those changes that are of interest to users and administrators.
     node.
  -- Don't requeue RPC going out from slurmctld to DOWN nodes (can generate
     repeating communication errors).
+ -- Propagate sbatch "--dist=plane=#" option to srun.
 
 * Changes in Slurm 15.08.1
 ==========================
@@ -506,6 +507,7 @@ documents those changes that are of interest to users and administrators.
     race condition of the node suspend and ping logic.
  -- Don't requeue RPC going out from slurmctld to DOWN nodes (can generate
     repeating communication errors).
+ -- Propagate sbatch "--dist=plane=#" option to srun.
 
 * Changes in Slurm 14.11.9
 ==========================

doc/html/elastic_computing.shtml

@@ -14,7 +14,7 @@ cluster.
 Good responsiveness and throughput can be achieved while you only pay for the
 resources needed.</p>
 
-<p>The rest of this document describes details abou. Slurm's infrastructure that
+<p>The rest of this document describes details about Slurm's infrastructure that
 can be used to support Elastic Computing.</p>
 
 <p>Slurm's Elastic Computing logic relies heavily upon the existing power save

src/common/proc_args.c

@@ -256,9 +256,14 @@ task_dist_states_t verify_dist_type(const char *arg, uint32_t *plane_size)
 		} else {
 			/* -m plane=<plane_size> */
 			dist_str = strchr(tok, '=');
-			if (dist_str != NULL) {
-				*plane_size = atoi(dist_str + 1);
+			if (!dist_str)
+				dist_str = getenv("SLURM_DIST_PLANESIZE");
+			else {
 				len = dist_str - tok;
+				dist_str++;
+			}
+			if (dist_str) {
+				*plane_size = atoi(dist_str);
 				plane_dist = true;
 			}
 		}

testsuite/expect/globals

@@ -1939,7 +1939,7 @@ proc test_select_type { } {
 #
 # Purpose: Determine SelectTypeParameters being used
 #
-# Returns value of SelectTypeParameters
+# Returns 1 if "type" (input) is found, 0 otherwise
 #
 ################################################################
 

testsuite/expect/test17.36

@@ -68,6 +68,20 @@ if {[test_select_type_params "CR_CPU"]} {
 	set cr_cpu 1
 }
 
+log_user 0
+set job_mem_opt  "--comment=no_mem"
+spawn -noecho $bin_bash -c "exec $scontrol show config | $bin_grep SelectTypeParameters"
+expect {
+	-re "MEMORY" {
+		set job_mem_opt  "--mem-per-cpu=4"
+		exp_continue
+	}
+	eof {
+		wait
+	}
+}
+log_user 1
+
 proc cr_core_cpu { node } {
 
 	global cr_cpu cr_core core_cnt socket_cnt scontrol number exit_code
@@ -147,11 +161,11 @@ proc delete_part {part} {
 }
 
 proc sub_job { job shared part } {
-	global sbatch file_in number job_id exit_code
+	global sbatch file_in number job_id exit_code job_mem_opt
 
 	set job_id 0
 	if { $shared } {
-		spawn $sbatch -a$job -t1 -p$part --share -o/dev/null $file_in
+		spawn $sbatch -a$job -t1 $job_mem_opt -p$part --share -o/dev/null $file_in
 		expect {
 			-re "Submitted batch job ($number)" {
 				set job_id $expect_out(1,string)
@@ -166,7 +180,7 @@ proc sub_job { job shared part } {
 			}
 		}
 	} else {
-		spawn $sbatch -a$job -t1 -p$part -o/dev/null $file_in
+		spawn $sbatch -a$job -t1 $job_mem_opt -p$part -o/dev/null $file_in
 		expect {
 			-re "Submitted batch job ($number)" {
 				set job_id $expect_out(1,string)

testsuite/expect/test9.8

@@ -56,7 +56,7 @@ if {![test_select_type_params "Memory"]} {
 } elseif {[test_launch_poe]} {
 	set mem_per_step 200
 } else {
-	set mem_per_step 1
+	set mem_per_step 4
 }
 
 #