github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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

Browse Source 
Fix error log when kill shim
This commit is contained in:
Phil Estes 2021-03-19 09:20:18 -04:00 committed by GitHub
commit fbf79545df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/v1/linux/runtime.go
View File

@ -219,7 +219,7 @@ func (r *Runtime) Create(ctx context.Context, id string, opts runtime.CreateOpts
namespaces.WithNamespace(context.TODO(), namespace), cleanupTimeout) namespaces.WithNamespace(context.TODO(), namespace), cleanupTimeout)
defer deferCancel() defer deferCancel()
if kerr := s.KillShim(deferCtx); kerr != nil { 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")
} }
} }
}() }()