[executor] Ensure DESTROY hooks can always terminate safely

AliceO2Group · Feb 15, 2021 · b0f1548 · b0f1548
1 parent ea713d8
commit b0f1548
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/executor/executable/basictaskcommon.go b/executor/executable/basictaskcommon.go
@@ -104,7 +104,8 @@ func (t *basicTaskBase) startBasicTask() (err error) {
 	}()
 
 	go func() {
-		err = t.taskCmd.Wait()
+		taskCmd := t.taskCmd
+		err = taskCmd.Wait()
 		// ^ when this unblocks, the task is done
 
 		pendingState := mesos.TASK_FINISHED
@@ -118,9 +119,13 @@ func (t *basicTaskBase) startBasicTask() (err error) {
 			pendingState = mesos.TASK_FAILED
 		}
 
-		// Can be -1 if the process was killed
-		exitCode := t.taskCmd.ProcessState.ExitCode()
-		processTerminatedOnItsOwn := true
+		exitCode := -1
+		processTerminatedOnItsOwn := false
+		if taskCmd != nil && taskCmd.ProcessState != nil {
+			// Can be -1 if the process was killed
+			exitCode = taskCmd.ProcessState.ExitCode()
+			processTerminatedOnItsOwn = true
+		}
 
 		select {
 		case pending := <- t.pendingFinalTaskStateCh: