opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-20 20:54:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23512 from rhatdan/mount

Browse Source 
Remove another race condition when mounting containers or images
This commit is contained in:
openshift-merge-bot[bot]
2024-08-06 11:41:10 +00:00
committed by GitHub
parent 69862b7251 abd586cb1c
commit 3275fd2dda
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,7 @@ import (
"github.com/containers/podman/v5/pkg/specgenutil" "github.com/containers/podman/v5/pkg/specgenutil"
"github.com/containers/podman/v5/pkg/util" "github.com/containers/podman/v5/pkg/util"
"github.com/containers/storage" "github.com/containers/storage"
"github.com/containers/storage/types"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
@ -1367,6 +1368,11 @@ func (ic *ContainerEngine) ContainerMount(ctx context.Context, nameOrIDs []strin
for _, ctr := range containers { for _, ctr := range containers {
report := entities.ContainerMountReport{Id: ctr.ID()} report := entities.ContainerMountReport{Id: ctr.ID()}
report.Path, report.Err = ctr.Mount() report.Path, report.Err = ctr.Mount()
if options.All &&
(errors.Is(report.Err, define.ErrNoSuchCtr) ||
errors.Is(report.Err, define.ErrCtrRemoved)) {
continue
}
reports = append(reports, &report) reports = append(reports, &report)
} }
if len(reports) > 0 { if len(reports) > 0 {
@ -1381,6 +1387,9 @@ func (ic *ContainerEngine) ContainerMount(ctx context.Context, nameOrIDs []strin
for _, sctr := range storageCtrs { for _, sctr := range storageCtrs {
mounted, path, err := ic.Libpod.IsStorageContainerMounted(sctr.ID) mounted, path, err := ic.Libpod.IsStorageContainerMounted(sctr.ID)
if err != nil { if err != nil {
if errors.Is(err, types.ErrContainerUnknown) {
continue
}
return nil, err return nil, err
} }
@ -1405,6 +1414,10 @@ func (ic *ContainerEngine) ContainerMount(ctx context.Context, nameOrIDs []strin
for _, ctr := range containers { for _, ctr := range containers {
mounted, path, err := ctr.Mounted() mounted, path, err := ctr.Mounted()
if err != nil { if err != nil {
if errors.Is(err, define.ErrNoSuchCtr) ||
errors.Is(err, define.ErrCtrRemoved) {
continue
}
return nil, err return nil, err
} }

4
pkg/domain/infra/abi/images.go
View File

@ -35,6 +35,7 @@ import (
"github.com/containers/podman/v5/pkg/errorhandling" "github.com/containers/podman/v5/pkg/errorhandling"
"github.com/containers/podman/v5/pkg/rootless" "github.com/containers/podman/v5/pkg/rootless"
"github.com/containers/storage" "github.com/containers/storage"
"github.com/containers/storage/types"
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"
imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
@ -181,6 +182,9 @@ func (ir *ImageEngine) Mount(ctx context.Context, nameOrIDs []string, opts entit
// We're only looking for mounted images. // We're only looking for mounted images.
mountPoint, err = i.Mountpoint() mountPoint, err = i.Mountpoint()
if err != nil { if err != nil {
if errors.Is(err, types.ErrImageUnknown) {
continue
}
return nil, err return nil, err
} }
// Not mounted, so skip. // Not mounted, so skip.