Merge pull request #6065 from hashicorp/b-nil-driver-exec

Check if driver handle is nil before execing
hashicorp · Aug 2, 2019 · 2e0d67c · 2e0d67c
2 parents 9ef22a4 + 488cd7e
commit 2e0d67c
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/client/allocrunner/taskrunner/task_runner.go b/client/allocrunner/taskrunner/task_runner.go
@@ -1361,7 +1361,12 @@ func appendTaskEvent(state *structs.TaskState, event *structs.TaskEvent, capacit
 }
 
 func (tr *TaskRunner) TaskExecHandler() drivermanager.TaskExecHandler {
-	return tr.getDriverHandle().ExecStreaming
+	// Check it is running
+	handle := tr.getDriverHandle()
+	if handle == nil {
+		return nil
+	}
+	return handle.ExecStreaming
 }
 
 func (tr *TaskRunner) DriverCapabilities() (*drivers.Capabilities, error) {