Imported Upstream version 14.03.3.2

META

@@ -11,7 +11,7 @@
   Minor:	03
   Micro:	3
   Version:	14.03.3
-  Release:	1
+  Release:	2
 
 ##
 #  When changing API_CURRENT update src/common/slurm_protocol_common.h

NEWS

 This file describes changes in recent versions of Slurm. It primarily
 documents those changes that are of interest to users and admins.
 
+* Changes in Slurm 14.03.3-2
+==========================
+ -- BGQ - Fix issue with uninitialized variable.
+
 * Changes in Slurm 14.03.3
 ==========================
  -- Correction to default batch output file name. In version 14.03.2 was using
@@ -437,6 +441,7 @@ documents those changes that are of interest to users and admins.
  -- BGQ - Move code to only start job on a block after limits are checked.
  -- Handle node ranges better when dealing with accounting max node limits.
  -- Fix perlapi to compile correctly with perl 5.18
+ -- BGQ - Fix issue with uninitialized variable.
 
 * Changes in Slurm 2.6.9
 ========================

doc/man/man5/slurm.conf.5

@@ -3726,16 +3726,36 @@ to all of the programs.
 .TP
 \fBBASIL_RESERVATION_ID\fR
 Basil reservation ID.
-Available on Cray XT/XE systems only.
+Available on Cray systems with ALPS only.
 .TP
 \fBMPIRUN_PARTITION\fR
 BlueGene partition name.
 Available on BlueGene systems only.
 .TP
+\fBSLURM_ARRAY_JOB_ID\fR
+If this job is part of a job array, this will be set to the job ID.
+Otherwise it will not be set.
+To reference this specific task of a job array, combine
+SLURM_ARRAY_JOB_ID with SLURM_ARRAY_TASK_ID
+(e.g. "scontrol update ${SLURM_ARRAY_JOB_ID}_{$SLURM_ARRAY_TASK_ID} ...");
+Available in \fBPrologSlurmctld\fR and \fBEpilogSlurmctld\fR only.
+.TP
+\fBSLURM_ARRAY_TASK_ID\fR
+If this job is part of a job array, this will be set to the task ID.
+Otherwise it will not be set.
+To reference this specific task of a job array, combine
+SLURM_ARRAY_JOB_ID with SLURM_ARRAY_TASK_ID
+(e.g. "scontrol update ${SLURM_ARRAY_JOB_ID}_{$SLURM_ARRAY_TASK_ID} ...");
+Available in \fBPrologSlurmctld\fR and \fBEpilogSlurmctld\fR only.
+.TP
 \fBSLURM_JOB_ACCOUNT\fR
 Account name used for the job.
 Available in \fBPrologSlurmctld\fR and \fBEpilogSlurmctld\fR only.
 .TP
+\fBSLURM_JOB_CLUSTER_NAME\fR
+Name of the cluster executing for the job.
+Available in \fBPrologSlurmctld\fR and \fBEpilogSlurmctld\fR only.
+.TP
 \fBSLURM_JOB_CONSTRAINTS\fR
 Features required to run the job.
 Available in \fBPrologSlurmctld\fR and \fBEpilogSlurmctld\fR only.
@@ -3756,7 +3776,6 @@ exit() function. The second number of the signal that caused the process to
 terminante if it was terminated by a signal.
 Available in \fBEpilogSlurmctld\fR only.
 .TP
-
 \fBSLURM_JOB_GID\fR
 Group ID of the job's owner.
 Available in \fBPrologSlurmctld\fR and \fBEpilogSlurmctld\fR only.
@@ -3767,6 +3786,9 @@ Available in \fBPrologSlurmctld\fR and \fBEpilogSlurmctld\fR only.
 .TP
 \fBSLURM_JOB_ID\fR
 Job ID.
+CAUTION: If this job is the first task of a job array, then Slurm commands using
+this job ID will refer to the entire job array rather than this specific task
+of the job array.
 .TP
 \fBSLURM_JOB_NAME\fR
 Name of the job.

src/plugins/select/bluegene/bg_job_run.c

@@ -656,7 +656,7 @@ int term_jobs_on_block(char *bg_block_id)
  */
 extern int start_job(struct job_record *job_ptr)
 {
-	int rc = SLURM_SUCCESS, dim;
+	int rc = SLURM_SUCCESS;
 	bg_record_t *bg_record = NULL;
 	bg_action_t *bg_action_ptr = NULL;
 	select_jobinfo_t *jobinfo = job_ptr->select_jobinfo->data;
@@ -668,19 +668,19 @@ extern int start_job(struct job_record *job_ptr)
 		slurm_mutex_unlock(&block_state_mutex);
 		error("bg_record %s doesn't exist, requested for job (%d)",
 		      jobinfo->bg_block_id, job_ptr->job_id);
-		_destroy_bg_action(bg_action_ptr);
 		return SLURM_ERROR;
 	}
 
 	if ((jobinfo->conn_type[0] != SELECT_NAV)
 	    && (jobinfo->conn_type[0] < SELECT_SMALL)) {
+		int dim;
 		for (dim=0; dim<SYSTEM_DIMENSIONS; dim++)
 			jobinfo->conn_type[dim] = bg_record->conn_type[dim];
 	}
 
 	/* If it isn't 0 then it was setup previous (sub-block)
 	*/
-	if (jobinfo->geometry[dim] == 0)
+	if (jobinfo->geometry[SYSTEM_DIMENSIONS] == 0)
 		memcpy(jobinfo->geometry, bg_record->geo,
 		       sizeof(bg_record->geo));
 

src/slurmctld/job_scheduler.c

@@ -2510,11 +2510,9 @@ static char **_build_env(struct job_record *job_ptr)
 	sprintf(buf, "%d:%d", exit_code, signal);
 	setenvf(&my_env, "SLURM_JOB_EXIT_CODE2", "%s", buf);
 
-	if (job_ptr->array_job_id != 0) {
+	if (job_ptr->array_task_id != NO_VAL) {
 		setenvf(&my_env, "SLURM_ARRAY_JOB_ID", "%u",
 			job_ptr->array_job_id);
-	}
-	if (job_ptr->array_task_id != NO_VAL) {
 		setenvf(&my_env, "SLURM_ARRAY_TASK_ID", "%u",
 			job_ptr->array_task_id);
 	}