Merge pull request #4923 from fuweid/fix-wrong-context

dmcgowan · web-flow · commit 6bf5650450fa · 2021-01-11T15:34:47.000-08:00
runtime/v2: should use defer ctx to cleanup
diff --git a/runtime/v2/manager.go b/runtime/v2/manager.go
@@ -155,7 +155,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
`@@ -155,7 +155,7 @@ func (m *TaskManager) Create(ctx context.Context, id string, opts runtime.Create`
`155`	`155`	`defer cancel()`
`156`	`156`	`_, errShim := shim.Delete(dctx)`
`157`	`157`	`if errShim != nil {`
`158`		`- shim.Shutdown(ctx)`
	`158`	`+ shim.Shutdown(dctx)`
`159`	`159`	`shim.Close()`
`160`	`160`	`}`
`161`	`161`	`}`