Merge pull request #32820 from coufon/change_collector_log

Automatic merge from submit-queue change the error log for empty resource usage This PR changes the error log for empty resource usage buffer for a container to be more clear. It happens when the container name is wrong, or cAdvisor somehow does not response.

Merge pull request #32820 from coufon/change_collector_log
d69cdce7 · Kubernetes Submit Queue · GitHub · 5975535d · 3e16eb50 · d69cdce7
Commit d69cdce7 authored Sep 15, 2016 by Kubernetes Submit Queue Committed by GitHub Sep 15, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

resource_collector.go test/e2e_node/resource_collector.go +1 -1

No files found.
--- a/test/e2e_node/resource_collector.go
+++ b/test/e2e_node/resource_collector.go
@@ -192,7 +192,7 @@ func (r *ResourceCollector) GetLatest() (framework.ResourceUsagePerContainer, er
 	for key, name := range systemContainers {
 		contStats, ok := r.buffers[name]
 		if !ok || len(contStats) == 0 {
-			return nil, fmt.Errorf("Resource usage of %s:%s is not ready yet", key, name)
+			return nil, fmt.Errorf("No resource usage data for %s container (%s)", key, name)
 		}
 		stats[key] = contStats[len(contStats)-1]
 	}