Merge pull request #3229 from epipho/fix-stats

Fix incorrect docker stats
hashicorp · Sep 17, 2017 · 033a077 · 033a077
2 parents 6dda055 + 56d591b
commit 033a077
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/client/driver/docker.go b/client/driver/docker.go
@@ -1657,16 +1657,15 @@ func (h *DockerHandle) collectStats() {
 				}
 
 				// Calculate percentage
-				cores := len(s.CPUStats.CPUUsage.PercpuUsage)
 				cs.Percent = calculatePercent(
 					s.CPUStats.CPUUsage.TotalUsage, s.PreCPUStats.CPUUsage.TotalUsage,
-					s.CPUStats.SystemCPUUsage, s.PreCPUStats.SystemCPUUsage, cores)
+					s.CPUStats.SystemCPUUsage, s.PreCPUStats.SystemCPUUsage, numCores)
 				cs.SystemMode = calculatePercent(
 					s.CPUStats.CPUUsage.UsageInKernelmode, s.PreCPUStats.CPUUsage.UsageInKernelmode,
-					s.CPUStats.CPUUsage.TotalUsage, s.PreCPUStats.CPUUsage.TotalUsage, cores)
+					s.CPUStats.CPUUsage.TotalUsage, s.PreCPUStats.CPUUsage.TotalUsage, numCores)
 				cs.UserMode = calculatePercent(
 					s.CPUStats.CPUUsage.UsageInUsermode, s.PreCPUStats.CPUUsage.UsageInUsermode,
-					s.CPUStats.CPUUsage.TotalUsage, s.PreCPUStats.CPUUsage.TotalUsage, cores)
+					s.CPUStats.CPUUsage.TotalUsage, s.PreCPUStats.CPUUsage.TotalUsage, numCores)
 				cs.TotalTicks = (cs.Percent / 100) * shelpers.TotalTicksAvailable() / float64(numCores)
 
 				h.resourceUsageLock.Lock()