github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-16 07:13:53 +00:00
Code Issues Projects Releases Wiki Activity

Add clarity and fix bugs for kubelet e2e test

Browse Source
This commit is contained in:
Yu-Ju Hong 2015-09-25 18:20:56 -07:00
parent e3188f6ee7
commit d19329aa6b
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e/kubelet_perf.go
View File

@ -74,7 +74,8 @@ var _ = Describe("Kubelet", func() {
Describe("resource usage tracking", func() { Describe("resource usage tracking", func() {
density := []int{0, 50} density := []int{0, 50}
for _, podsPerNode := range density { for i := range density {
podsPerNode := density[i]
name := fmt.Sprintf( name := fmt.Sprintf(
"over %v with %d pods per node.", monitoringTime, podsPerNode) "over %v with %d pods per node.", monitoringTime, podsPerNode)
It(name, func() { It(name, func() {
@ -103,8 +104,8 @@ var _ = Describe("Kubelet", func() {
// entries if we plan to monitor longer (e.g., 8 hours). // entries if we plan to monitor longer (e.g., 8 hours).
deadline := time.Now().Add(monitoringTime) deadline := time.Now().Add(monitoringTime)
for time.Now().Before(deadline) { for time.Now().Before(deadline) {
Logf("Still running...%v left", deadline.Sub(time.Now()))
time.Sleep(reportingPeriod) time.Sleep(reportingPeriod)
Logf("Still running...")
logPodsOnNodes(framework.Client, nodeNames.List()) logPodsOnNodes(framework.Client, nodeNames.List())
} }

6
test/e2e/kubelet_stats.go
View File

@ -413,12 +413,12 @@ func (r *resourceCollector) LogLatest() {
defer r.lock.RUnlock() defer r.lock.RUnlock()
stats := make(map[string]*containerResourceUsage) stats := make(map[string]*containerResourceUsage)
for _, name := range r.containers { for _, name := range r.containers {
s := r.buffers[name][len(r.buffers)-1] contStats, ok := r.buffers[name]
if s == nil { if !ok || len(contStats) == 0 {
Logf("Resource usage on node %q is not ready yet", r.node) Logf("Resource usage on node %q is not ready yet", r.node)
return return
} }
stats[name] = s stats[name] = contStats[len(contStats)-1]
} }
Logf("\n%s", formatResourceUsageStats(r.node, stats)) Logf("\n%s", formatResourceUsageStats(r.node, stats))
} }