Commit 02951f18 authored by gmarek's avatar gmarek

Correctly handle nil resource usage in performance e2e tests

parent ded8e03f
...@@ -369,10 +369,8 @@ func getOneTimeResourceUsageOnNode( ...@@ -369,10 +369,8 @@ func getOneTimeResourceUsageOnNode(
} }
f := func(name string, newStats *stats.ContainerStats) *ContainerResourceUsage { f := func(name string, newStats *stats.ContainerStats) *ContainerResourceUsage {
// TODO(gmarek): remove when #46198 is debugged. if newStats == nil || newStats.CPU == nil || newStats.Memory == nil {
if newStats == nil || newStats.CPU == nil { return nil
glog.Warning("NewStats is %#v for container %v", newStats, name)
return &ContainerResourceUsage{}
} }
return &ContainerResourceUsage{ return &ContainerResourceUsage{
Name: name, Name: name,
...@@ -401,7 +399,9 @@ func getOneTimeResourceUsageOnNode( ...@@ -401,7 +399,9 @@ func getOneTimeResourceUsageOnNode(
if !isInteresting { if !isInteresting {
continue 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 return usageMap, nil
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment