erabo/spiegel_podman
1
0
Fork 0
mirror of https://github.com/podman-container-tools/podman.git synced 2026-10-28 00:37:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #23645 from Luap99/mount-race

Browse source 
podman mount: fix storage/libpod ctr race
This commit is contained in:
openshift-merge-bot[bot] 2024-08-16 13:24:24 +00:00 • committed by GitHub
commit e8410b8395
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkg/domain/infra/abi/containers.go
View file

@ -1392,7 +1392,11 @@ func (ic *ContainerEngine) ContainerMount(ctx context.Context, nameOrIDs []strin
for _, sctr := range storageCtrs {
mounted, path, err := ic.Libpod.IsStorageContainerMounted(sctr.ID)
if err != nil {
if errors.Is(err, types.ErrContainerUnknown) {
// ErrCtrExists means this is a libpod container, we handle that below.
// This can only happen in a narrow race because we first create the storage
// container and then the libpod container so the StorageContainers() call
// above would need to happen in that interval.
if errors.Is(err, types.ErrContainerUnknown) || errors.Is(err, define.ErrCtrExists) {
continue
}
return nil, err