Merge branch 'slurm-15.08'

SchedMD · Mar 18, 2016 · 78d1bcf · 78d1bcf
2 parents 2178163 + 1ed38f2
commit 78d1bcf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/NEWS b/NEWS
@@ -201,6 +201,8 @@ documents those changes that are of interest to users and administrators.
  -- Update gang scheduling data structures when job changes in size.
  -- Associations - prevent hash table corruption if uid initially unset for
     a user, which can cause slurmctld to crash if that user is deleted.
+ -- Avoid possibly aborting srun that gets simultaneous SIGSTOP+SIGCONT while
+    creating the job step.
 
 * Changes in Slurm 15.08.8
 ==========================

diff --git a/src/api/step_ctx.c b/src/api/step_ctx.c
@@ -77,7 +77,8 @@ static int destroy_step = 0;
 static void _signal_while_allocating(int signo)
 {
 	debug("Got signal %d", signo);
-	if (signo == SIGCONT)
+	/* NOTE: Near simultaneous SIGSTOP+SIGCONT can result in signo == 0 */
+	if ((signo == SIGCONT) || (signo == 0))
 		return;
 
 	destroy_step = signo;

diff --git a/src/srun/libsrun/allocate.c b/src/srun/libsrun/allocate.c
@@ -118,7 +118,8 @@ static void *_safe_signal_while_allocating(void *in_data)
 	int signo = *(int *)in_data;
 
 	debug("Got signal %d", signo);
-	if (signo == SIGCONT)
+	/* NOTE: Near simultaneous SIGSTOP+SIGCONT can result in signo == 0 */
+	if ((signo == SIGCONT) || (signo == 0))
 		return NULL;
 
 	destroy_job = 1;