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

Fix container stats panic.

Browse Source 
Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu 2017-10-05 02:18:19 +00:00
parent 23b8330b44
commit 94b68ae662
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/server/container_stats_list.go
View File

@ -102,15 +102,19 @@ func (c *criContainerdService) getContainerMetrics(
return nil, fmt.Errorf("failed to extract container metrics: %v", err) return nil, fmt.Errorf("failed to extract container metrics: %v", err)
} }
metrics := s.(*cgroups.Metrics) metrics := s.(*cgroups.Metrics)
if metrics.CPU != nil && metrics.CPU.Usage != nil {
cs.Cpu = &runtime.CpuUsage{ cs.Cpu = &runtime.CpuUsage{
Timestamp: stats.Timestamp.UnixNano(), Timestamp: stats.Timestamp.UnixNano(),
UsageCoreNanoSeconds: &runtime.UInt64Value{metrics.CPU.Usage.Total}, UsageCoreNanoSeconds: &runtime.UInt64Value{metrics.CPU.Usage.Total},
} }
}
if metrics.Memory != nil && metrics.Memory.Usage != nil {
cs.Memory = &runtime.MemoryUsage{ cs.Memory = &runtime.MemoryUsage{
Timestamp: stats.Timestamp.UnixNano(), Timestamp: stats.Timestamp.UnixNano(),
WorkingSetBytes: &runtime.UInt64Value{metrics.Memory.Usage.Usage}, WorkingSetBytes: &runtime.UInt64Value{metrics.Memory.Usage.Usage},
} }
} }
}
return &cs, nil return &cs, nil
} }