dilim/containerd
1
0
Fork 0
mirror of https://github.com/containerd/containerd.git synced 2026-08-09 09:33:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13896 from dgrisonnet/fix-sandbox-metrics-return-nil

Browse Source 
cri: skip failed container instead of dropping entire sandbox metrics
This commit is contained in:
Mike Brown
2026-08-03 16:28:01 +00:00
committed by GitHub
parent d46562dbc9 34524e8a68
commit 8c8b4a8489
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/cri/server/list_pod_sandbox_metrics_linux.go
View File

@@ -109,7 +109,7 @@ 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
@@ -117,7 +117,7 @@ func (c *criService) ListPodSandboxMetrics(ctx context.Context, r *runtime.ListP
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
}
}