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

Merge pull request #7198 from endocrimes/dani/fix-panic

Browse Source
This commit is contained in:
Fu Wei
2022-07-22 23:23:45 +08:00
committed by GitHub
parent badb66113c 3125f7e1a0
commit 05a71fdc28
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/cri/server/container_stats_list.go
View File

@@ -65,12 +65,14 @@ func (c *criService) toCRIContainerStats(
return nil, fmt.Errorf("failed to decode container metrics for %q: %w", cntr.ID, err) return nil, fmt.Errorf("failed to decode container metrics for %q: %w", cntr.ID, err)
} }
// this is a calculated value and should be computed for all OSes if cs.Cpu != nil && cs.Cpu.UsageCoreNanoSeconds != nil {
nanoUsage, err := c.getUsageNanoCores(cntr.Metadata.ID, false, cs.Cpu.UsageCoreNanoSeconds.Value, time.Unix(0, cs.Cpu.Timestamp)) // this is a calculated value and should be computed for all OSes
if err != nil { nanoUsage, err := c.getUsageNanoCores(cntr.Metadata.ID, false, cs.Cpu.UsageCoreNanoSeconds.Value, time.Unix(0, cs.Cpu.Timestamp))
return nil, fmt.Errorf("failed to get usage nano cores, containerID: %s: %w", cntr.Metadata.ID, err) if err != nil {
return nil, fmt.Errorf("failed to get usage nano cores, containerID: %s: %w", cntr.Metadata.ID, err)
}
cs.Cpu.UsageNanoCores = &runtime.UInt64Value{Value: nanoUsage}
} }
cs.Cpu.UsageNanoCores = &runtime.UInt64Value{Value: nanoUsage}
containerStats.Stats = append(containerStats.Stats, cs) containerStats.Stats = append(containerStats.Stats, cs)
} }