influxdata#4375 - fix docker tests memory usage

julienmathevet · Jul 5, 2018 · 3e23835 · 3e23835
1 parent 26e28ff
commit 3e23835
Show file tree

Hide file tree

Showing 3 changed files with 215 additions and 4 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/plugins/inputs/docker/docker.go b/plugins/inputs/docker/docker.go
@@ -532,7 +532,7 @@ func gatherContainerStats(
 		mem := calculateMemUsageUnixNoCache(stat.MemoryStats)
 		memLimit := float64(stat.MemoryStats.Limit)
 		memfields["usage"] = mem
-		memfields["usage_percent"] = calculateMemPercentUnixNoCache(memLimit, mem)
+		memfields["usage_percent"] = calculateMemPercentUnixNoCache(memLimit, float64(mem))
 	} else {
 		memfields["commit_bytes"] = stat.MemoryStats.Commit
 		memfields["commit_peak_bytes"] = stat.MemoryStats.CommitPeak

diff --git a/plugins/inputs/docker/stats_helpers.go b/plugins/inputs/docker/stats_helpers.go
@@ -41,8 +41,8 @@ func calculateCPUPercentWindows(v *types.StatsJSON) float64 {
 
 // calculateMemUsageUnixNoCache calculate memory usage of the container.
 // Page cache is intentionally excluded to avoid misinterpretation of the output.
-func calculateMemUsageUnixNoCache(mem types.MemoryStats) float64 {
-	return float64(mem.Usage - mem.Stats["cache"])
+func calculateMemUsageUnixNoCache(mem types.MemoryStats) uint64 {
+	return mem.Usage - mem.Stats["cache"]
 }
 
 func calculateMemPercentUnixNoCache(limit float64, usedNoCache float64) float64 {