Skip to content

Only Reset non-nil fields. #2558

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
helsaawy merged 1 commit into from
Nov 12, 2025
+12 −3
Merged

Only Reset non-nil fields. #2558

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 12 additions & 3 deletions internal/guest/runtime/hcsv2/uvm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1027,10 +1027,19 @@ func (h *Host) GetProperties(ctx context.Context, containerID string, query prot
// zero out [Blkio] sections, since:
// 1. (Az)CRI (currently) only looks at the CPU and memory sections; and
// 2. it can get very large for containers with many layers
cgroupMetrics.Blkio.Reset()
if cgroupMetrics.GetBlkio() != nil {
cgroupMetrics.Blkio.Reset()
}
// also preemptively zero out [Rdma] and [Network], since they could also grow untenable large
cgroupMetrics.Rdma.Reset()
cgroupMetrics.Network = []*cgroup1stats.NetworkStat{}
if cgroupMetrics.GetRdma() != nil {
cgroupMetrics.Rdma.Reset()
}
if len(cgroupMetrics.GetNetwork()) > 0 {
cgroupMetrics.Network = []*cgroup1stats.NetworkStat{}
}
if logrus.IsLevelEnabled(logrus.TraceLevel) {
log.G(ctx).WithField("stats", log.Format(ctx, cgroupMetrics)).Trace("queried cgroup statistics")
}
properties.Metrics = cgroupMetrics
default:
log.G(ctx).WithField("propertyType", requestedProperty).Warn("unknown or empty property type")
Expand Down