From ed41324b7b7d115ea5751384991d1bd0bd55868e Mon Sep 17 00:00:00 2001 From: Piotr Szczesniak Date: Wed, 13 Sep 2017 18:36:35 +0200 Subject: [PATCH] Use RSS instead of Usage when filtering out terminated containers --- metrics/sources/summary/summary.go | 2 +- metrics/sources/summary/summary_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/metrics/sources/summary/summary.go b/metrics/sources/summary/summary.go index 4ad0237736..8a7bf1a846 100644 --- a/metrics/sources/summary/summary.go +++ b/metrics/sources/summary/summary.go @@ -210,7 +210,7 @@ func (this *summaryMetricsSource) decodePodStats(metrics map[string]*MetricSet, func containerIsTerminated(container *stats.ContainerStats, otherStartTime time.Time) bool { if container.StartTime.Time.Before(otherStartTime) { - if *container.CPU.UsageNanoCores == 0 && *container.Memory.UsageBytes == 0 { + if *container.CPU.UsageNanoCores == 0 && *container.Memory.RSSBytes == 0 { return true } glog.Warningf("Two identical containers are reported and the older one is not terminated: %v", container) diff --git a/metrics/sources/summary/summary_test.go b/metrics/sources/summary/summary_test.go index 9760986abf..d893f1ce4d 100644 --- a/metrics/sources/summary/summary_test.go +++ b/metrics/sources/summary/summary_test.go @@ -338,9 +338,9 @@ func genTestSummaryCPU(seed int) *stats.CPUStats { func genTestSummaryZeroMemory(seed int) *stats.MemoryStats { return &stats.MemoryStats{ Time: metav1.NewTime(scrapeTime), - UsageBytes: uint64Val(seed, -seed), + UsageBytes: uint64Val(seed, offsetMemUsageBytes), WorkingSetBytes: uint64Val(seed, offsetMemWorkingSetBytes), - RSSBytes: uint64Val(seed, offsetMemRSSBytes), + RSSBytes: uint64Val(seed, -seed), PageFaults: uint64Val(seed, offsetMemPageFaults), MajorPageFaults: uint64Val(seed, offsetMemMajorPageFaults), }