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

Merge pull request #24091 from Luap99/mount-race 

podman mount: ignore ErrLayerUnknown
This commit is contained in:
openshift-merge-bot[bot] 2024-09-30 18:31:32 +00:00 committed by GitHub
parent 639f3c6336 1950555b26
commit 1f5ec677d8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libpod/runtime_ctr.go
View File

@ -1412,13 +1412,13 @@ func (r *Runtime) IsStorageContainerMounted(id string) (bool, string, error) {
mountCnt, err := r.storageService.MountedContainerImage(id)
if err != nil {
return false, "", err
return false, "", fmt.Errorf("get mount count of container: %w", err)
}
mounted := mountCnt > 0
if mounted {
path, err = r.storageService.GetMountpoint(id)
if err != nil {
return false, "", err
return false, "", fmt.Errorf("get container mount point: %w", err)
}
}
return mounted, path, nil

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

@ -1418,10 +1418,10 @@ func (ic *ContainerEngine) ContainerMount(ctx context.Context, nameOrIDs []strin
// 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) {
if errors.Is(err, types.ErrContainerUnknown) || errors.Is(err, types.ErrLayerUnknown) || errors.Is(err, define.ErrCtrExists) {
continue
}
return nil, err
return nil, fmt.Errorf("check if storage container is mounted: %w", err)
}
var name string
@ -1449,7 +1449,7 @@ func (ic *ContainerEngine) ContainerMount(ctx context.Context, nameOrIDs []strin
errors.Is(err, define.ErrCtrRemoved) {
continue
}
return nil, err
return nil, fmt.Errorf("check if container is mounted: %w", err)
}
if mounted {