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

Merge pull request #9033 from dcantah/sberror-include-id

Browse Source 
CRI: Include sandbox ID in failed to recover error
This commit is contained in:
Fu Wei 2023-09-02 10:48:34 +08:00 committed by GitHub
commit e2bf34feaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/cri/sbserver/restart.go
View File

@ -76,7 +76,11 @@ func (c *criService) recover(ctx context.Context) error {
eg.Go(func() error { eg.Go(func() error {
sb, err := podSandboxLoader.RecoverContainer(ctx2, sandbox) sb, err := podSandboxLoader.RecoverContainer(ctx2, sandbox)
if err != nil { if err != nil {
log.G(ctx2).WithError(err).Errorf("Failed to load sandbox %q", sandbox.ID()) log.G(ctx2).
WithError(err).
WithField("sandbox", sandbox.ID()).
Error("Failed to load sandbox")
return nil return nil
} }
log.G(ctx2).Debugf("Loaded sandbox %+v", sb) log.G(ctx2).Debugf("Loaded sandbox %+v", sb)
@ -116,7 +120,11 @@ func (c *criService) recover(ctx context.Context) error {
status, err := controller.Status(ctx, sbx.ID, false) status, err := controller.Status(ctx, sbx.ID, false)
if err != nil { if err != nil {
log.G(ctx).WithError(err).Error("failed to recover sandbox state") log.G(ctx).
WithError(err).
WithField("sandbox", sbx.ID).
Error("failed to recover sandbox state")
if errdefs.IsNotFound(err) { if errdefs.IsNotFound(err) {
state = sandboxstore.StateNotReady state = sandboxstore.StateNotReady
} }
@ -151,7 +159,11 @@ func (c *criService) recover(ctx context.Context) error {
eg.Go(func() error { eg.Go(func() error {
cntr, err := c.loadContainer(ctx2, container) cntr, err := c.loadContainer(ctx2, container)
if err != nil { if err != nil {
log.G(ctx2).WithError(err).Errorf("Failed to load container %q", container.ID()) log.G(ctx2).
WithError(err).
WithField("container", container.ID()).
Error("Failed to load container")
return nil return nil
} }
log.G(ctx2).Debugf("Loaded container %+v", cntr) log.G(ctx2).Debugf("Loaded container %+v", cntr)