Merge remote-tracking branch 'origin/slurm-14.11'

NEWS

@@ -134,6 +134,12 @@ documents those changes that are of interest to users and administrators.
 ==========================
  -- Correct the squeue command taking into account that a node can
     have NULL name if it is not in DNS but still in slurm.conf.
+ -- Fix slurmdbd regression which would cause a segfault when a node is set
+    down with no reason.
+ -- BGQ - Fix issue with job arrays not being handled correctly
+    in the runjob_mux plugin.
+ -- Print FAIR_TREE, if configured, in "scontrol show config" output for
+    PriorityFlags.
 
 * Changes in Slurm 14.11.4
 ==========================

src/common/slurm_protocol_defs.c

@@ -1851,6 +1851,11 @@ extern char *priority_flags_string(uint16_t priority_flags)
 			xstrcat(flag_str, ",");
 		xstrcat(flag_str, "DEPTH_OBLIVIOUS");
 	}
+	if (priority_flags & PRIORITY_FLAGS_FAIR_TREE) {
+		if (flag_str[0])
+			xstrcat(flag_str, ",");
+		xstrcat(flag_str, "FAIR_TREE");
+	}
 
 	return flag_str;
 }

src/plugins/select/bluegene/runjob_plugin.cc

@@ -239,9 +239,36 @@ void Plugin::execute(bgsched::runjob::Verify& verify)
 			+ "."
 			+ boost::lexical_cast<std::string>(runjob_job->step_id);
 		goto deny_job;
-	}
+	} else if (step_resp->job_step_count > 1) {
+		uint32_t i;
+
+		found = 0;
+		for (i = 0, step_ptr = step_resp->job_steps;
+		     i < step_resp->job_step_count; i++, step_ptr++) {
+			if ((uint32_t)runjob_job->job_id == step_ptr->job_id) {
+				found = 1;
+				break;
+			}
+		}
+
+		if (!found) {
+			message = "Couldn't get job array task from response!";
+			goto deny_job;
+		}
+	} else
+		step_ptr = &step_resp->job_steps[0];
 
-	step_ptr = &step_resp->job_steps[0];
+	if ((uint32_t)runjob_job->job_id != step_ptr->job_id) {
+		message = "Step returned is for a different job "
+			+ boost::lexical_cast<std::string>(step_ptr->job_id)
+			+ "."
+			+ boost::lexical_cast<std::string>(step_ptr->step_id)
+			+ " != "
+			+ boost::lexical_cast<std::string>(runjob_job->job_id)
+			+ "."
+			+ boost::lexical_cast<std::string>(runjob_job->step_id);
+		goto deny_job;
+	}
 
 	/* A bit of verification to make sure this is the correct user
 	   supposed to be running.