docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

client: stats: fill in stats info on client 

This code was lost in a rebase in the PIDs cgroup merge, fix it so that
`docker stats` actually shows statistics from the PIDs cgroup.

Signed-off-by: Aleksa Sarai <asarai@suse.com>
This commit is contained in:
Aleksa Sarai 2016-03-12 14:45:30 +11:00
parent 77f501a0c6
commit 084241a37b
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/client/stats_helpers.go
View File

@ -116,6 +116,7 @@ func (s *containerStats) Collect(cli client.APIClient, streamStats bool, waitFir
s.NetworkRx, s.NetworkTx = calculateNetwork(v.Networks) s.NetworkRx, s.NetworkTx = calculateNetwork(v.Networks)
s.BlockRead = float64(blkRead) s.BlockRead = float64(blkRead)
s.BlockWrite = float64(blkWrite) s.BlockWrite = float64(blkWrite)
s.PidsCurrent = v.PidsStats.Current
s.mu.Unlock() s.mu.Unlock()
u <- nil u <- nil
if !streamStats { if !streamStats {
@ -137,6 +138,7 @@ func (s *containerStats) Collect(cli client.APIClient, streamStats bool, waitFir
s.NetworkTx = 0 s.NetworkTx = 0
s.BlockRead = 0 s.BlockRead = 0
s.BlockWrite = 0 s.BlockWrite = 0
s.PidsCurrent = 0
s.mu.Unlock() s.mu.Unlock()
// if this is the first stat you get, release WaitGroup // if this is the first stat you get, release WaitGroup
if !getFirst { if !getFirst {