svn merge -r20497:20509 https://eris.llnl.gov/svn/slurm/branches/slurm-2.1

NEWS

@@ -318,6 +318,10 @@ documents those changes that are of interest to users and admins.
     --ntasks-per-node is.
  -- Make sure account and wckey for a job are lower case before inserting into
     accounting.
+ -- Added note to squeue documentation about --jobs option displaying jobs
+    even if they are on hidden partitions.
+ -- Fix srun to work correctly with --uid when getting an allocation
+    and creating a step.
 
 * Changes in SLURM 2.1.9
 ========================

doc/man/man1/squeue.1

@@ -48,6 +48,8 @@ By default, prints a time stamp with the header.
 Requests a comma separated list of job ids to display.  Defaults to all jobs.
 The \fB\-\-jobs=<job_id_list>\fR option may be used in conjunction with the
 \fB\-\-steps\fR option to print step information about specific jobs.
+Note: If a list of job ids is provided, the jobs are displayed even if
+they are on hidden partitions.
 
 .TP
 \fB\-l\fR, \fB\-\-long\fR

src/srun/srun.c

@@ -257,6 +257,12 @@ int srun(int ac, char **av)
 	/* Set up slurmctld message handler */
 	slurmctld_msg_init();
 
+	/*
+	 *  Become --uid user
+	 */
+	if (_become_user () < 0)
+		info ("Warning: Unable to assume uid=%lu\n", opt.uid);
+
 	/* now global "opt" should be filled in and available,
 	 * create a job from opt
 	 */
@@ -279,9 +285,9 @@ int srun(int ac, char **av)
 		job_id = resp->job_id;
 		if (opt.nodes_set_env && !opt.nodes_set_opt &&
 		    (opt.min_nodes > resp->node_cnt)) {
-			/* This signifies the job used the --no-kill option 
+			/* This signifies the job used the --no-kill option
 			 * and a node went DOWN or it used a node count range
-			 * specification, was checkpointed from one size and 
+			 * specification, was checkpointed from one size and
 			 * restarted at a different size */
 			error("SLURM_NNODES environment varariable "
 			      "conflicts with allocated node count (%u!=%u).",
@@ -294,7 +300,7 @@ int srun(int ac, char **av)
 				opt.ntasks = opt.min_nodes;
 		}
 		if (opt.alloc_nodelist == NULL)
-                       opt.alloc_nodelist = xstrdup(resp->node_list);
+			opt.alloc_nodelist = xstrdup(resp->node_list);
 		if (opt.exclusive)
 			_step_opt_exclusive();
 		_set_cpu_env_var(resp);
@@ -349,12 +355,6 @@ int srun(int ac, char **av)
 		slurm_free_resource_allocation_response_msg(resp);
 	}
 
-	/*
-	 *  Become --uid user
-	 */
-	if (_become_user () < 0)
-		info ("Warning: Unable to assume uid=%lu", opt.uid);
-
 	/*
 	 *  Enhance environment for job
 	 */
@@ -638,7 +638,7 @@ _print_job_information(resource_allocation_response_msg_t *resp)
 	for (i = 0; i < resp->num_cpu_groups; i++) {
 		xstrfmtcat(str, "%s%u(x%u)",
 			   sep, resp->cpus_per_node[i],
-		           resp->cpu_count_reps[i]);
+			   resp->cpu_count_reps[i]);
 		sep = ",";
 	}
 	verbose("%s", str);
@@ -1423,4 +1423,3 @@ static int _setup_signals(void)
 
 	return rc;
 }
-

testsuite/expect/test1.40

@@ -91,7 +91,7 @@ expect {
 		set job_id2 $expect_out(1,string)
 		exp_continue
 	}
-	-re "Account=MY_ACCT" {
+	-re "Account=my_acct" {
 		set match_acct 1
 		exp_continue
 	}
@@ -115,7 +115,7 @@ if {$match_acct == 0} {
 set match_acct 0
 spawn $scontrol show job $job_id2
 expect {
-	-re "Account=QA_ACCT" {
+	-re "Account=qa_acct" {
 		set match_acct 1
 		exp_continue
 	}

testsuite/expect/test15.25

@@ -38,6 +38,7 @@ set exit_code   0
 set job_id1     0
 set job_id2     0
 set job_acct    "TEST_ACCT"
+set job_acct_lc "test_acct"
 
 print_header $test_id
 
@@ -92,7 +93,7 @@ expect {
 		set job_id2 $expect_out(1,string)
 		exp_continue
 	}
-	-re "Account=$job_acct" {
+	-re "Account=$job_acct_lc" {
 		set match_acct 1
 		exp_continue
 	}
@@ -119,7 +120,7 @@ if {$match_acct == 0} {
 set match_acct 0
 spawn $scontrol show job $job_id2
 expect {
-	-re "Account=$job_acct" {
+	-re "Account=$job_acct_lc" {
 		set match_acct 1
 		exp_continue
 	}