From 02951f182e73294c672a9782577a4d2905e67e69 Mon Sep 17 00:00:00 2001
From: gmarek <gmarek@google.com>
Date: Thu, 25 May 2017 11:39:59 +0200
Subject: [PATCH] Correctly handle nil resource usage in performance e2e tests

---
 test/e2e/framework/kubelet_stats.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/e2e/framework/kubelet_stats.go b/test/e2e/framework/kubelet_stats.go
index d3a25a405c5..8a61d204087 100644
--- a/test/e2e/framework/kubelet_stats.go
+++ b/test/e2e/framework/kubelet_stats.go
@@ -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