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

Merge pull request #6091 from rhatdan/v2 

Eliminate race condition on podman info
This commit is contained in:
OpenShift Merge Robot 2020-05-06 22:00:32 +02:00 committed by GitHub
parent ab67664d34 ad27532b6c
commit 062c7b8a94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libpod/info.go
View File

@ -198,9 +198,15 @@ func (r *Runtime) getContainerStoreInfo() (define.ContainerStore, error) {
if err != nil { if err != nil {
return cs, err return cs, err
} }
cs.Number = len(cons)
for _, con := range cons { for _, con := range cons {
state, err := con.State() state, err := con.State()
if err != nil { if err != nil {
if errors.Cause(err) == define.ErrNoSuchCtr {
// container was probably removed
cs.Number--
continue
}
return cs, err return cs, err
} }
switch state { switch state {
@ -212,7 +218,6 @@ func (r *Runtime) getContainerStoreInfo() (define.ContainerStore, error) {
stopped += 1 stopped += 1
} }
} }
cs.Number = len(cons)
cs.Paused = paused cs.Paused = paused
cs.Stopped = stopped cs.Stopped = stopped
cs.Running = running cs.Running = running