From 501b8c1af6f7ffd1753d0c6aeeae2d1e95cb612f Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Wed, 31 Dec 2014 12:41:46 -0800
Subject: [PATCH] Fix for sattach protocol version
This was broken by commit 2a5271c1af4599f5bd17dbe68dcc12fc024fe717
test16.4 was failing since sattach was not setting a protocol version.
---
src/slurmd/slurmstepd/mgr.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/slurmd/slurmstepd/mgr.c b/src/slurmd/slurmstepd/mgr.c
index 517ebe0e84a..7947551bd98 100644
--- a/src/slurmd/slurmstepd/mgr.c
+++ b/src/slurmd/slurmstepd/mgr.c
@@ -707,12 +707,14 @@ _send_exit_msg(stepd_step_rec_t *job, uint32_t *tid, int n, int status)
i = list_iterator_create(job->sruns);
while ((srun = list_next(i))) {
resp.address = srun->resp_addr;
- resp.protocol_version = srun->protocol_version;
if ((resp.address.sin_family == 0) &&
(resp.address.sin_port == 0) &&
(resp.address.sin_addr.s_addr == 0))
continue; /* no srun or sattach here */
+ if (srun->protocol_version) /* Not set by sattach */
+ resp.protocol_version = srun->protocol_version;
+
if (_send_srun_resp_msg(&resp, job->nnodes) != SLURM_SUCCESS)
error("Failed to send MESSAGE_TASK_EXIT: %m");
}
--
GitLab