Merge pull request #23881 from tonistiigi/exec-wait

Fix error reporting on executor wait
Upstream-commit: e82dcf1c6de82680ae34a64735d0da0c080085ba
Component: engine

components/engine/daemon/cluster/executor/container/controller.go

@@ -155,9 +155,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()
 	}
@@ -169,6 +166,7 @@ func (r *controller) Wait(pctx context.Context) error {
 		if ec, ok := err.(exec.ExitCoder); ok {
 			ee.code = ec.ExitCode()
 		}
+		return ee
 	}
 	return nil
 }