Skip to content
Snippets Groups Projects
Commit ed650433 authored by Morris Jette's avatar Morris Jette
Browse files

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.
parent 00327d2a
No related branches found
No related tags found
No related merge requests found
...@@ -1303,6 +1303,14 @@ static bool _opt_verify(void) ...@@ -1303,6 +1303,14 @@ static bool _opt_verify(void)
if (!opt.wait_all_nodes) if (!opt.wait_all_nodes)
info("Cray needs --wait-all-nodes to wait on ALPS reservation"); info("Cray needs --wait-all-nodes to wait on ALPS reservation");
opt.wait_all_nodes = true; 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) #elif defined(HAVE_BGL)
if (opt.blrtsimage && strchr(opt.blrtsimage, ' ')) { if (opt.blrtsimage && strchr(opt.blrtsimage, ' ')) {
error("invalid BlrtsImage given '%s'", opt.blrtsimage); error("invalid BlrtsImage given '%s'", opt.blrtsimage);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment