Merge pull request #1807 from piosz/mem-fix

Use RSS instead of Usage when filtering out terminated containers
kubernetes-retired · Sep 13, 2017 · 0b96b6a · 0b96b6a
2 parents c079c2a + ed41324
commit 0b96b6a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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),
 	}