Merge branch 'slurm-2.2'

NEWS

@@ -201,6 +201,8 @@ documents those changes that are of interest to users and admins.
 
 * Changes in SLURM 2.2.7
 ========================
+ -- Eliminate zombie process created if salloc exits with stopped child
+    process. Patch from Gerrit Renker, CSCS.
 
 * Changes in SLURM 2.2.6
 ========================

src/salloc/salloc.c

@@ -476,6 +476,9 @@ relinquish:
 
 		if (WIFEXITED(status)) {
 			rc = WEXITSTATUS(status);
+		} else if (WIFSTOPPED(status)) {
+			/* Terminate stopped child process */
+			_forward_signal(SIGKILL);
 		} else if (WIFSIGNALED(status)) {
 			verbose("Command \"%s\" was terminated by signal %d",
 				command_argv[0], WTERMSIG(status));