From d22592b1f8224ef403e52fb4de426296d3b487bb Mon Sep 17 00:00:00 2001 From: Wojciech Tyczynski Date: Tue, 3 Nov 2015 09:04:54 +0100 Subject: [PATCH] Fix panics in Density test --- test/e2e/kubelet_stats.go | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/test/e2e/kubelet_stats.go b/test/e2e/kubelet_stats.go index 3e76cf492eb..6c7c8bcdabd 100644 --- a/test/e2e/kubelet_stats.go +++ b/test/e2e/kubelet_stats.go @@ -368,18 +368,15 @@ func computePercentiles(timeSeries map[time.Time]resourceUsagePerContainer, perc return make(map[int]resourceUsagePerContainer) } dataMap := make(map[string]*usageDataPerContainer) - for _, v := range timeSeries { - for k := range v { - dataMap[k] = &usageDataPerContainer{ - cpuData: make([]float64, len(timeSeries)), - memUseData: make([]int64, len(timeSeries)), - memWorkSetData: make([]int64, len(timeSeries)), - } - } - break - } for _, singleStatistic := range timeSeries { for name, data := range singleStatistic { + if dataMap[name] == nil { + dataMap[name] = &usageDataPerContainer{ + cpuData: make([]float64, len(timeSeries)), + memUseData: make([]int64, len(timeSeries)), + memWorkSetData: make([]int64, len(timeSeries)), + } + } dataMap[name].cpuData = append(dataMap[name].cpuData, data.CPUUsageInCores) dataMap[name].memUseData = append(dataMap[name].memUseData, data.MemoryUsageInBytes) dataMap[name].memWorkSetData = append(dataMap[name].memWorkSetData, data.MemoryWorkingSetInBytes)