Merge pull request #4929 from fuweid/cherry-pick-1.4-846cb963c

estesp · web-flow · commit 00f5ffa45d44 · 2021-01-12T09:33:02.000-05:00
[release/1.4] runtime/v2: should use defer ctx to cleanup
diff --git a/runtime/v2/manager.go b/runtime/v2/manager.go
@@ -159,7 +159,7 @@ func (m *TaskManager) Create(ctx context.Context, id string, opts runtime.Create
 			defer cancel()
 			_, errShim := shim.Delete(dctx)
 			if errShim != nil {
-				shim.Shutdown(ctx)
+				shim.Shutdown(dctx)
 				shim.Close()
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ func (m *TaskManager) Create(ctx context.Context, id string, opts runtime.Create`
`159`	`159`	`defer cancel()`
`160`	`160`	`_, errShim := shim.Delete(dctx)`
`161`	`161`	`if errShim != nil {`
`162`		`- shim.Shutdown(ctx)`
	`162`	`+ shim.Shutdown(dctx)`
`163`	`163`	`shim.Close()`
`164`	`164`	`}`
`165`	`165`	`}`