From 993e045ff9531c04856b8868f767e69e1e5b2886 Mon Sep 17 00:00:00 2001 From: Nick Ethier Date: Wed, 10 Oct 2018 22:11:45 -0400 Subject: [PATCH] taskrunner: return error on waitCh --- client/allocrunner/taskrunner/lifecycle.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/allocrunner/taskrunner/lifecycle.go b/client/allocrunner/taskrunner/lifecycle.go index 7a3397696..a561ec8da 100644 --- a/client/allocrunner/taskrunner/lifecycle.go +++ b/client/allocrunner/taskrunner/lifecycle.go @@ -33,8 +33,9 @@ func (tr *TaskRunner) Restart(ctx context.Context, event *structs.TaskEvent, fai // Drain the wait channel or wait for the request context to be canceled waitCh, err := handle.WaitCh(ctx) if err != nil { - tr.logger.Error("failed to kill task. Resources may have been leaked", "error", err) + return err } + <-waitCh return nil }