From a85206fef0a5752ad7d2f228cc98e6799f59b89e Mon Sep 17 00:00:00 2001 From: Juan Galvez Date: Tue, 1 Dec 2015 14:16:23 -0600 Subject: [PATCH] charmrun FT: Fix wrong output in ssh script during recovery from node crash The ssh script was written before the new host is chosen, and so the hostname in the ssh script could be incorrect. Fix this by choosing the new host right before the script is written. Change-Id: I7546aec4813dd75d8b5109d379ec4e9848bf1a85 --- src/util/charmrun-src/charmrun.C | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/charmrun-src/charmrun.C b/src/util/charmrun-src/charmrun.C index 664548e553..67f39da56d 100644 --- a/src/util/charmrun-src/charmrun.C +++ b/src/util/charmrun-src/charmrun.C @@ -5125,11 +5125,11 @@ void restart_node(int crashed_node) restart_argv[i + 2] = "+restartisomalloc"; restart_argv[i + 3] = NULL; - rsh_script(f, pe, crashed_node, restart_argv, 1); - fclose(f); /** change the nodetable entry of the crashed processor to connect it to a new one**/ refill_nodetab_entry(crashed_node); + rsh_script(f, pe, crashed_node, restart_argv, 1); + fclose(f); /**start the new processor */ restart_rsh_pid = rsh_fork(pe, startScript); /**wait for the reply from the new process*/ -- 2.11.4.GIT