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

Merge pull request #11621 from k8s-infra-cherrypick-robot/cherry-pick-11475-to-release/2.0

Browse Source 
[release/2.0] fix: call checkCopyShimLogError(shimCtx) to avoid expected error log flood
This commit is contained in:
Fu Wei 2025-03-28 19:12:21 -04:00 committed by GitHub
commit 9e97c2e626
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/runtime/v2/shim.go
View File

@ -91,9 +91,9 @@ func loadShim(ctx context.Context, bundle *Bundle, onClose func()) (_ ShimInstan
// To prevent flood of error messages, the expected error // To prevent flood of error messages, the expected error
// should be reset, like os.ErrClosed or os.ErrNotExist, which // should be reset, like os.ErrClosed or os.ErrNotExist, which
// depends on platform. // depends on platform.
err = checkCopyShimLogError(ctx, err) err = checkCopyShimLogError(shimCtx, err)
if err != nil { if err != nil {
log.G(ctx).WithError(err).Error("copy shim log after reload") log.G(shimCtx).WithError(err).Error("copy shim log after reload")
} }
}() }()
onCloseWithShimLog := func() { onCloseWithShimLog := func() {