opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-21 01:19:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16327 from tyler92/fix-deadlock-pod-ps-inspect

Browse Source 
Fix deadlock between 'podman ps' and 'container inspect' commands
This commit is contained in:
OpenShift Merge Robot
2022-10-28 04:40:23 -04:00
committed by GitHub
parent d444c2c001 f355900d34
commit 40073ab3d4
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libpod/pod_api.go
View File

@ -581,20 +581,15 @@ func (p *Pod) Status() (map[string]define.ContainerStatus, error) {
} }
func containerStatusFromContainers(allCtrs []*Container) (map[string]define.ContainerStatus, error) { func containerStatusFromContainers(allCtrs []*Container) (map[string]define.ContainerStatus, error) {
// We need to lock all the containers
for _, ctr := range allCtrs {
ctr.lock.Lock()
defer ctr.lock.Unlock()
}
// Now that all containers are locked, get their status
status := make(map[string]define.ContainerStatus, len(allCtrs)) status := make(map[string]define.ContainerStatus, len(allCtrs))
for _, ctr := range allCtrs { for _, ctr := range allCtrs {
if err := ctr.syncContainer(); err != nil { state, err := ctr.State()
if err != nil {
return nil, err return nil, err
} }
status[ctr.ID()] = ctr.state.State status[ctr.ID()] = state
} }
return status, nil return status, nil