From d19329aa6beacf57287791063acd0c2e88259179 Mon Sep 17 00:00:00 2001 From: Yu-Ju Hong Date: Fri, 25 Sep 2015 18:20:56 -0700 Subject: [PATCH] Add clarity and fix bugs for kubelet e2e test --- test/e2e/kubelet_perf.go | 5 +++-- test/e2e/kubelet_stats.go | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/test/e2e/kubelet_perf.go b/test/e2e/kubelet_perf.go index 1febb72083b..89668f92d7f 100644 --- a/test/e2e/kubelet_perf.go +++ b/test/e2e/kubelet_perf.go @@ -74,7 +74,8 @@ var _ = Describe("Kubelet", func() { Describe("resource usage tracking", func() { density := []int{0, 50} - for _, podsPerNode := range density { + for i := range density { + podsPerNode := density[i] name := fmt.Sprintf( "over %v with %d pods per node.", monitoringTime, podsPerNode) It(name, func() { @@ -103,8 +104,8 @@ var _ = Describe("Kubelet", func() { // entries if we plan to monitor longer (e.g., 8 hours). deadline := time.Now().Add(monitoringTime) for time.Now().Before(deadline) { + Logf("Still running...%v left", deadline.Sub(time.Now())) time.Sleep(reportingPeriod) - Logf("Still running...") logPodsOnNodes(framework.Client, nodeNames.List()) } diff --git a/test/e2e/kubelet_stats.go b/test/e2e/kubelet_stats.go index 1d6998197c2..e688e460006 100644 --- a/test/e2e/kubelet_stats.go +++ b/test/e2e/kubelet_stats.go @@ -413,12 +413,12 @@ func (r *resourceCollector) LogLatest() { defer r.lock.RUnlock() stats := make(map[string]*containerResourceUsage) for _, name := range r.containers { - s := r.buffers[name][len(r.buffers)-1] - if s == nil { + contStats, ok := r.buffers[name] + if !ok || len(contStats) == 0 { Logf("Resource usage on node %q is not ready yet", r.node) return } - stats[name] = s + stats[name] = contStats[len(contStats)-1] } Logf("\n%s", formatResourceUsageStats(r.node, stats)) }