clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-05 13:11:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14488 from HuKeping/fixstats

Browse Source 
Fix connection block when using docker stats API
This commit is contained in:
Brian Goff
2015-09-08 10:01:11 -04:00
parent be7d346504 d9bf8163ad
commit 5f5d73d515
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/client/stats.go
+9 -3
View File
@@ -61,10 +61,16 @@ func (s *containerStats) Collect(cli *DockerCli, streamStats bool) {
u <- err
return
}
var (
var memPercent = 0.0
var cpuPercent = 0.0
// MemoryStats.Limit will never be 0 unless the container is not running and we havn't
// got any data from cgroup
if v.MemoryStats.Limit != 0 {
memPercent = float64(v.MemoryStats.Usage) / float64(v.MemoryStats.Limit) * 100.0
cpuPercent = 0.0
)
}
previousCPU = v.PreCPUStats.CPUUsage.TotalUsage
previousSystem = v.PreCPUStats.SystemUsage
cpuPercent = calculateCPUPercent(previousCPU, previousSystem, v)