Merge pull request #4054 from fuweid/cp13-4048

estesp · web-flow · commit 449e926990f8 · 2020-02-26T07:30:52.000-05:00
[release/1.3 backport] bugfix: cleanup dangling shim by brand new context
diff --git a/runtime/v1/linux/runtime.go b/runtime/v1/linux/runtime.go
@@ -62,6 +62,9 @@ const (
 	configFilename = "config.json"
 	defaultRuntime = "runc"
 	defaultShim    = "containerd-shim"
+
+	// cleanupTimeout is default timeout for cleanup operations
+	cleanupTimeout = 1 * time.Minute
 )
 
 func init() {
@@ -212,7 +215,10 @@ func (r *Runtime) Create(ctx context.Context, id string, opts runtime.CreateOpts
 	}
 	defer func() {
 		if err != nil {
-			if kerr := s.KillShim(ctx); kerr != nil {
+			deferCtx, deferCancel := context.WithTimeout(
+				namespaces.WithNamespace(context.TODO(), namespace), cleanupTimeout)
+			defer deferCancel()
+			if kerr := s.KillShim(deferCtx); kerr != nil {
 				log.G(ctx).WithError(err).Error("failed to kill shim")
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,9 @@ const (`
`62`	`62`	`configFilename = "config.json"`
`63`	`63`	`defaultRuntime = "runc"`
`64`	`64`	`defaultShim = "containerd-shim"`
	`65`	`+`
	`66`	`+ // cleanupTimeout is default timeout for cleanup operations`
	`67`	`+ cleanupTimeout = 1 * time.Minute`
`65`	`68`	`)`
`66`	`69`
`67`	`70`	`func init() {`
`@@ -212,7 +215,10 @@ func (r *Runtime) Create(ctx context.Context, id string, opts runtime.CreateOpts`
`212`	`215`	`}`
`213`	`216`	`defer func() {`
`214`	`217`	`if err != nil {`
`215`		`- if kerr := s.KillShim(ctx); kerr != nil {`
	`218`	`+ deferCtx, deferCancel := context.WithTimeout(`
	`219`	`+ namespaces.WithNamespace(context.TODO(), namespace), cleanupTimeout)`
	`220`	`+ defer deferCancel()`
	`221`	`+ if kerr := s.KillShim(deferCtx); kerr != nil {`
`216`	`222`	`log.G(ctx).WithError(err).Error("failed to kill shim")`
`217`	`223`	`}`
`218`	`224`	`}`