From 4c0cce5b44f2809f5b7e4280ab4498f26aa33d7b Mon Sep 17 00:00:00 2001
From: "Christopher J. Morrone" <morrone2@llnl.gov>
Date: Tue, 7 Nov 2006 01:16:15 +0000
Subject: [PATCH] svn merge -r10049:10052
https://eris.llnl.gov/svn/slurm/branches/slurm-1.1
---
NEWS | 1 +
src/srun/msg.c | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/NEWS b/NEWS
index 7c598bcc45a..34a03e8edb7 100644
--- a/NEWS
+++ b/NEWS
@@ -105,6 +105,7 @@ documents those changes that are of interest to users and admins.
- Add logic to save/restore select/cons_res state information.
- BLUEGENE - make all sprintf's into snprintf's
- Fix timeout calculation to work correctly for fan out.
+ - Fix for "srun -A" segfault on a node failure.
* Changes in SLURM 1.1.17
=========================
diff --git a/src/srun/msg.c b/src/srun/msg.c
index 8643de82fbf..61d08f01f9c 100644
--- a/src/srun/msg.c
+++ b/src/srun/msg.c
@@ -392,7 +392,10 @@ static void _node_fail_handler(int fd, srun_job_t *job)
}
slurm_mutex_unlock(&job->task_mutex);
- client_io_handler_downnodes(job->client_io, node_ids, num_node_ids);
+ if (!opt.allocate) {
+ client_io_handler_downnodes(job->client_io, node_ids,
+ num_node_ids);
+ }
if (!opt.no_kill) {
update_job_state(job, SRUN_JOB_FORCETERM);
--
GitLab