From 3c2be97b5db460affb8040c8253ce78f2994c40d Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Fri, 11 Dec 2009 20:09:51 +0000
Subject: [PATCH] Make it so env var SLURM_SRUN_COMM_HOST is overwritten if
already in existance in the slurmd.
---
NEWS | 2 ++
src/slurmd/slurmd/req.c | 5 ++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/NEWS b/NEWS
index 0d1920b0fd5..59ec01ac9cb 100644
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,8 @@ documents those changes that are of interest to users and admins.
current version of slurm installed on system when building against the api.
-- Patch from Matthieu Hautreux that adds an entry into the error file when
a job or step receives a TERM or KILL signal.
+ -- Make it so env var SLURM_SRUN_COMM_HOST is overwritten if already in
+ existance in the slurmd.
* Changes in SLURM 2.1.0-pre8
=============================
diff --git a/src/slurmd/slurmd/req.c b/src/slurmd/slurmd/req.c
index 651326e9cc7..7d0d4ac1328 100644
--- a/src/slurmd/slurmd/req.c
+++ b/src/slurmd/slurmd/req.c
@@ -840,7 +840,10 @@ _rpc_launch_tasks(slurm_msg_t *msg)
slurm_get_ip_str(cli, &port, host, sizeof(host));
info("launch task %u.%u request from %u.%u@%s (port %hu)", req->job_id,
req->job_step_id, req->uid, req->gid, host, port);
- env_array_append(&req->env, "SLURM_SRUN_COMM_HOST", host);
+
+ /* this could be set previously and needs to be overwritten by
+ this call for messages to work correctly for the new call */
+ env_array_overwrite(&req->env, "SLURM_SRUN_COMM_HOST", host);
req->envc = envcount(req->env);
first_job_run = !slurm_cred_jobid_cached(conf->vctx, req->job_id);
--
GitLab