Merge pull request #5230 from wzshiming/fix/log-kill-shim

estesp · web-flow · commit fbf79545dff6 · 2021-03-19T09:20:18.000-04:00
Fix error log when kill shim
diff --git a/runtime/v1/linux/runtime.go b/runtime/v1/linux/runtime.go
@@ -219,7 +219,7 @@ func (r *Runtime) Create(ctx context.Context, id string, opts runtime.CreateOpts
 				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")
+				log.G(ctx).WithError(kerr).Error("failed to kill shim")
 			}
 		}
 	}()

Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ func (r *Runtime) Create(ctx context.Context, id string, opts runtime.CreateOpts`
`219`	`219`	`namespaces.WithNamespace(context.TODO(), namespace), cleanupTimeout)`
`220`	`220`	`defer deferCancel()`
`221`	`221`	`if kerr := s.KillShim(deferCtx); kerr != nil {`
`222`		`- log.G(ctx).WithError(err).Error("failed to kill shim")`
	`222`	`+ log.G(ctx).WithError(kerr).Error("failed to kill shim")`
`223`	`223`	`}`
`224`	`224`	`}`
`225`	`225`	`}()`