From 217149c199131943d3e13409b094f86cc0d648aa Mon Sep 17 00:00:00 2001 From: gmarek Date: Tue, 8 Dec 2015 12:12:16 +0100 Subject: [PATCH] Tweak constants in monitor_resources test --- test/e2e/kubelet_stats.go | 2 +- test/e2e/monitor_resources.go | 16 ++++------------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/test/e2e/kubelet_stats.go b/test/e2e/kubelet_stats.go index 78182c1a94b..80b465196b5 100644 --- a/test/e2e/kubelet_stats.go +++ b/test/e2e/kubelet_stats.go @@ -207,7 +207,7 @@ type containerResourceUsage struct { } func (r *containerResourceUsage) isStrictlyGreaterThan(rhs *containerResourceUsage) bool { - return r.CPUUsageInCores > rhs.CPUUsageInCores && r.MemoryUsageInBytes > rhs.MemoryUsageInBytes && r.MemoryWorkingSetInBytes > rhs.MemoryWorkingSetInBytes + return r.CPUUsageInCores > rhs.CPUUsageInCores && r.MemoryWorkingSetInBytes > rhs.MemoryWorkingSetInBytes } type resourceUsagePerContainer map[string]*containerResourceUsage diff --git a/test/e2e/monitor_resources.go b/test/e2e/monitor_resources.go index 4b5ad6be26a..b8bcb523ed7 100644 --- a/test/e2e/monitor_resources.go +++ b/test/e2e/monitor_resources.go @@ -32,20 +32,17 @@ var systemContainers = []string{"/docker-daemon", "/kubelet", "/system"} var allowedUsage = resourceUsagePerContainer{ "/docker-daemon": &containerResourceUsage{ - CPUUsageInCores: 0.08, - MemoryUsageInBytes: 4500000000, + CPUUsageInCores: 0.1, MemoryWorkingSetInBytes: 1500000000, }, // TODO: Make Kubelet constraints sane again when #17774 is fixed. "/kubelet": &containerResourceUsage{ CPUUsageInCores: 0.1, - MemoryUsageInBytes: 1000000000, - MemoryWorkingSetInBytes: 250000000, + MemoryWorkingSetInBytes: 300000000, }, "/system": &containerResourceUsage{ - CPUUsageInCores: 0.03, - MemoryUsageInBytes: 100000000, - MemoryWorkingSetInBytes: 100000000, + CPUUsageInCores: 0.05, + MemoryWorkingSetInBytes: 700000000, }, } @@ -58,7 +55,6 @@ func computeAverage(sliceOfUsages []resourceUsagePerContainer) (result resourceU for _, container := range systemContainers { singleResult := &containerResourceUsage{ CPUUsageInCores: result[container].CPUUsageInCores + usage[container].CPUUsageInCores, - MemoryUsageInBytes: result[container].MemoryUsageInBytes + usage[container].MemoryUsageInBytes, MemoryWorkingSetInBytes: result[container].MemoryWorkingSetInBytes + usage[container].MemoryWorkingSetInBytes, } result[container] = singleResult @@ -67,7 +63,6 @@ func computeAverage(sliceOfUsages []resourceUsagePerContainer) (result resourceU for _, container := range systemContainers { singleResult := &containerResourceUsage{ CPUUsageInCores: result[container].CPUUsageInCores / float64(len(sliceOfUsages)), - MemoryUsageInBytes: result[container].MemoryUsageInBytes / int64(len(sliceOfUsages)), MemoryWorkingSetInBytes: result[container].MemoryWorkingSetInBytes / int64(len(sliceOfUsages)), } result[container] = singleResult @@ -123,9 +118,6 @@ var _ = Describe("Resource usage of system containers", func() { if allowedUsage[container].CPUUsageInCores < cUsage.CPUUsageInCores { Logf("CPU is too high for %s (%v)", container, cUsage.CPUUsageInCores) } - if allowedUsage[container].MemoryUsageInBytes < cUsage.MemoryUsageInBytes { - Logf("Memory use is too high for %s (%v)", container, cUsage.MemoryUsageInBytes) - } if allowedUsage[container].MemoryWorkingSetInBytes < cUsage.MemoryWorkingSetInBytes { Logf("Working set is too high for %s (%v)", container, cUsage.MemoryWorkingSetInBytes) }