From ed650433ebbab370d756dd9aa4c578cf2da14a6a Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Tue, 7 Jun 2011 21:16:15 -0700
Subject: [PATCH] select/cray: disable user-provided kill command
This disables setting the kill command on Cray platforms, to ensure that
always either SIGHUP (interactive shells) or SIGTERM (all others) is sent.
Patch 01_Cray-salloc-no-kill-command.diff from Gerrit Renker, CSCS.
---
src/salloc/opt.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/salloc/opt.c b/src/salloc/opt.c
index 98ece0d1523..84e2108daca 100644
--- a/src/salloc/opt.c
+++ b/src/salloc/opt.c
@@ -1303,6 +1303,14 @@ static bool _opt_verify(void)
if (!opt.wait_all_nodes)
info("Cray needs --wait-all-nodes to wait on ALPS reservation");
opt.wait_all_nodes = true;
+ if (opt.kill_command_signal_set) {
+ /*
+ * Disabled to avoid that the user supplies a weaker signal that
+ * could cause the child processes not to terminate.
+ */
+ info("The --kill-command is not supported on Cray.");
+ opt.kill_command_signal_set = false;
+ }
#elif defined(HAVE_BGL)
if (opt.blrtsimage && strchr(opt.blrtsimage, ' ')) {
error("invalid BlrtsImage given '%s'", opt.blrtsimage);
--
GitLab