luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge pull request #5889 from hashicorp/dani/b-task-restart 

tr: Fetch Wait channel before killTask in restart
This commit is contained in:
Danielle 2019-06-26 16:18:08 +02:00 committed by GitHub
parent 448b759578 b9ac184e1f
commit d6b8a0a290
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
client/allocrunner/taskrunner/lifecycle.go
View File

@ -28,18 +28,19 @@ func (tr *TaskRunner) Restart(ctx context.Context, event *structs.TaskEvent, fai
// Tell the restart tracker that a restart triggered the exit // Tell the restart tracker that a restart triggered the exit
tr.restartTracker.SetRestartTriggered(failure) tr.restartTracker.SetRestartTriggered(failure)
// Grab a handle to the wait channel that will timeout with context cancelation
// _before_ killing the task.
waitCh, err := handle.WaitCh(ctx)
if err != nil {
return err
}
// Kill the task using an exponential backoff in-case of failures. // Kill the task using an exponential backoff in-case of failures.
if err := tr.killTask(handle); err != nil { if err := tr.killTask(handle); err != nil {
// We couldn't successfully destroy the resource created. // We couldn't successfully destroy the resource created.
tr.logger.Error("failed to kill task. Resources may have been leaked", "error", err) tr.logger.Error("failed to kill task. Resources may have been leaked", "error", err)
} }
// Drain the wait channel or wait for the request context to be canceled
waitCh, err := handle.WaitCh(ctx)
if err != nil {
return err
}
select { select {
case <-waitCh: case <-waitCh:
case <-ctx.Done(): case <-ctx.Done():