From e36ba278383597a94e014fbcd80a1bb1bfbaadb0 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Sat, 3 Apr 2010 00:25:27 +0000
Subject: [PATCH] svn merge -r19964:19967
https://eris.llnl.gov/svn/slurm/branches/slurm-2.1
---
src/plugins/sched/wiki2/job_modify.c | 5 ++++-
src/slurmd/slurmstepd/task.c | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/plugins/sched/wiki2/job_modify.c b/src/plugins/sched/wiki2/job_modify.c
index 4473de9d664..1fc1320b62d 100644
--- a/src/plugins/sched/wiki2/job_modify.c
+++ b/src/plugins/sched/wiki2/job_modify.c
@@ -315,7 +315,6 @@ host_fini: if (rc) {
}
if (new_node_cnt) {
- static uint16_t cpus_per_node = 0;
job_desc_msg_t job_desc;
memset(&job_desc, 0, sizeof(job_desc_msg_t));
@@ -337,6 +336,9 @@ host_fini: if (rc) {
info("wiki: change job %u min_nodes to %u",
jobid, new_node_cnt);
#ifdef HAVE_BG
+{
+ static uint16_t cpus_per_node = 0;
+
job_ptr->details->min_cpus = job_desc.min_cpus;
job_ptr->details->max_cpus = job_desc.max_cpus;
job_ptr->details->pn_min_cpus = job_desc.pn_min_cpus;
@@ -351,6 +353,7 @@ host_fini: if (rc) {
select_g_select_jobinfo_set(job_ptr->select_jobinfo,
SELECT_JOBDATA_NODE_CNT,
&new_node_cnt);
+}
#endif
last_job_update = now;
update_accounting = true;
diff --git a/src/slurmd/slurmstepd/task.c b/src/slurmd/slurmstepd/task.c
index c6abebddb19..daa5e5c4257 100644
--- a/src/slurmd/slurmstepd/task.c
+++ b/src/slurmd/slurmstepd/task.c
@@ -143,7 +143,7 @@ static void _proc_stdout(char *buf, char ***env)
equal_ptr--;
equal_ptr[0] = '\0';
end_line[0] = '\0';
- info("export name:%s:val:%s:", name_ptr, val_ptr);
+ debug("export name:%s:val:%s:", name_ptr, val_ptr);
if (setenvf(env, name_ptr, "%s", val_ptr)) {
error("Unable to set %s environment variable",
buf_ptr);
@@ -162,7 +162,7 @@ static void _proc_stdout(char *buf, char ***env)
while (isspace(end_line[-1]))
end_line--;
end_line[0] = '\0';
- info(" unset name:%s:", name_ptr);
+ debug(" unset name:%s:", name_ptr);
unsetenvp(*env, name_ptr);
if (end_buf)
end_line[0] = '\0';
--
GitLab