podman mount: some better error wrapping
As shown in #23671 these functions can return the raw error without any useful context to the user which makes it hard to understand where things went wrong. Simply add some context to some error paths here. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
parent
5c3019e028
commit
1950555b26
|
@ -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
|
||||
|
|
|
@ -1421,7 +1421,7 @@ func (ic *ContainerEngine) ContainerMount(ctx context.Context, nameOrIDs []strin
|
|||
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 {
|
||||
|
|
Loading…
Reference in New Issue