From 9d859318a672e0f5a906698b3c22d874417f51c1 Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Wed, 22 Jun 2016 17:49:46 -0700 Subject: [PATCH] Fix error reporting on executor wait Signed-off-by: Tonis Tiigi Upstream-commit: c895a76f1076c782011e9decf58ab6548cf0fb35 Component: engine --- .../engine/daemon/cluster/executor/container/controller.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/components/engine/daemon/cluster/executor/container/controller.go b/components/engine/daemon/cluster/executor/container/controller.go index efdd12ac3b..91da0a1696 100644 --- a/components/engine/daemon/cluster/executor/container/controller.go +++ b/components/engine/daemon/cluster/executor/container/controller.go @@ -152,9 +152,6 @@ func (r *controller) Wait(pctx context.Context) error { defer cancel() err := r.adapter.wait(ctx) - if err != nil { - return err - } if ctx.Err() != nil { return ctx.Err() } @@ -166,6 +163,7 @@ func (r *controller) Wait(pctx context.Context) error { if ec, ok := err.(exec.ExitCoder); ok { ee.code = ec.ExitCode() } + return ee } return nil }