opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-08 14:48:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add batch check to container stats lock

Browse Source 
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>

Closes: #1249
Approved by: rhatdan
This commit is contained in:
Matthew Heon
2018-08-09 17:36:10 -04:00
committed by Atomic Bot
parent c27b7cdc93
commit 71c28c7cda
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libpod/stats.go
View File

@@ -16,11 +16,15 @@ func (c *Container) GetContainerStats(previousStats *ContainerStats) (*Container
stats := new(ContainerStats) stats := new(ContainerStats)
stats.ContainerID = c.ID() stats.ContainerID = c.ID()
stats.Name = c.Name() stats.Name = c.Name()
c.lock.Lock()
defer c.lock.Unlock() if !c.batched {
if err := c.syncContainer(); err != nil { c.lock.Lock()
return stats, err defer c.lock.Unlock()
if err := c.syncContainer(); err != nil {
return stats, err
}
} }
if c.state.State != ContainerStateRunning { if c.state.State != ContainerStateRunning {
return stats, nil return stats, nil
} }