retag of slurm v1.2.34

chaos · Aug 22, 2008 · 41b7678 · 41b7678
2 parents 7687b9b + 179f614
commit 41b7678
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/NEWS b/NEWS
@@ -17,6 +17,9 @@ documents those changes that are of interest to users and admins.
     upon the address from which slurmd gets the task launch request rather then
     "hostname" where srun executes.
  -- Make test for StateSaveLocation directory more comprehensive.
+ -- For jobcomp/script plugin, PROCS environment variable is now the actual
+    count of allocated processors rather than the count of processses to 
+    be started.
 
 * Changes in SLURM 1.2.33
 =========================

diff --git a/src/plugins/jobcomp/script/jobcomp_script.c b/src/plugins/jobcomp/script/jobcomp_script.c
@@ -179,12 +179,24 @@ static struct jobcomp_info * _jobcomp_info_create (struct job_record *job)
 	j->limit = job->time_limit;
 	j->start = job->start_time;
 	j->end = job->end_time;
-	j->submit = job->details ? job->details->submit_time:job->start_time;;
+	j->submit = job->details ? job->details->submit_time:job->start_time;
 	j->batch_flag = job->batch_flag;
 	j->nodes = xstrdup (job->nodes);
-	j->nprocs = job->num_procs;
 	j->account = job->account ? xstrdup (job->account) : NULL;
 
+	if (job->num_cpu_groups && job->cpus_per_node && job->cpu_count_reps) {
+		/* compute count of processors actually scheduled to job */
+		int i;
+		j->nprocs = 0;
+		for (i=0; i<job->num_cpu_groups; i++) {
+			j->nprocs += job->cpus_per_node[i] * 
+				     job->cpu_count_reps[i];
+		}
+	} else {
+		/* never scheduled resources */
+		j->nprocs = job->num_procs;
+	}
+
 	return (j);
 }
 

diff --git a/testsuite/expect/test17.12 b/testsuite/expect/test17.12
@@ -60,6 +60,7 @@ expect {
 	}
 	-re "Submitted batch job ($number)" {
 		send_user "\nFAILURE: sbatch job submitted with invalid constraint\n"
+		cancel_job $expect_out(1,string)
 		set exit_code 1
 		exp_continue
 	}