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

Merge pull request #12047 from mheon/remove_infra_from_db

Browse Source 
[NO NEW TESTS NEEDED] Remove infra ID from DB before removing containers
This commit is contained in:
OpenShift Merge Robot
2021-10-21 17:58:41 +00:00
committed by GitHub
parent 54f2c9a540 30245f5849
commit c09fab59dd
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libpod/runtime_pod_linux.go
View File

@ -263,6 +263,15 @@ func (r *Runtime) removePod(ctx context.Context, p *Pod, removeCtrs, force bool,
} }
} }
// Clear infra container ID before we remove the infra container.
// There is a potential issue if we don't do that, and removal is
// interrupted between RemoveAllContainers() below and the pod's removal
// later - we end up with a reference to a nonexistent infra container.
p.state.InfraContainerID = ""
if err := p.save(); err != nil {
return err
}
// Remove all containers in the pod from the state. // Remove all containers in the pod from the state.
if err := r.state.RemovePodContainers(p); err != nil { if err := r.state.RemovePodContainers(p); err != nil {
// If this fails, there isn't much more we can do. // If this fails, there isn't much more we can do.