Skip to content

[pull] main from containerd:main #443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Aug 3, 2026
Merged

[pull] main from containerd:main #443

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34524e8
cri: skip failed container instead of dropping entire sandbox metrics
dgrisonnet Aug 3, 2026
8c8b4a8
Merge pull request #13896 from dgrisonnet/fix-sandbox-metrics-return-nil
mikebrow Aug 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions internal/cri/server/list_pod_sandbox_metrics_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,15 +109,15 @@ func (c *criService) ListPodSandboxMetrics(ctx context.Context, r *runtime.ListP
case errdefs.IsUnavailable(err), errdefs.IsNotFound(err):
log.G(gctx).WithField("podsandboxid", sandbox.ID).WithField("containerid", container.ID).WithError(err).Error("failed to get container metrics, this is likely a transient error")
// Don't return error for transient issues, just log and continue
return nil
continue
case errdefs.IsCanceled(err):
log.G(gctx).WithField("podsandboxid", sandbox.ID).WithField("containerid", container.ID).WithError(err).Debug("metrics collection cancelled")
// Return the cancellation error to stop other goroutines
return err
default:
log.G(gctx).WithField("podsandboxid", sandbox.ID).WithField("containerid", container.ID).WithError(err).Error("failed to collect container metrics")
// Don't return error for individual failures, just log and continue
return nil
continue
}
}

Expand Down
Loading