github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Correctly handle nil resource usage in performance e2e tests

Browse Source
This commit is contained in:
gmarek 2017-05-25 11:39:59 +02:00
parent ded8e03fc3
commit 02951f182e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e/framework/kubelet_stats.go
View File

@ -369,10 +369,8 @@ func getOneTimeResourceUsageOnNode(
}
f := func(name string, newStats *stats.ContainerStats) *ContainerResourceUsage {
// TODO(gmarek): remove when #46198 is debugged.
if newStats == nil || newStats.CPU == nil {
glog.Warning("NewStats is %#v for container %v", newStats, name)
return &ContainerResourceUsage{}
if newStats == nil || newStats.CPU == nil || newStats.Memory == nil {
return nil
}
return &ContainerResourceUsage{
Name: name,
@ -401,7 +399,9 @@ func getOneTimeResourceUsageOnNode(
if !isInteresting {
continue
}
usageMap[pod.PodRef.Name+"/"+container.Name] = f(pod.PodRef.Name+"/"+container.Name, &container)
if usage := f(pod.PodRef.Name+"/"+container.Name, &container); usage != nil {
usageMap[pod.PodRef.Name+"/"+container.Name] = usage
}
}
}
return usageMap, nil