mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2025-06-13 02:33:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: Removing JoinError in favor of fmt.Errorf

Browse Source 
Signed-off-by: Mike Perez <thingee@gmail.com>
This commit is contained in:
Mike Perez
2024-05-07 15:51:05 -07:00
committed by mergify[bot]
parent 8f7a4c43be
commit c8af2b638a
8 changed files with 14 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/rbd/rbd_util.go
View File

@ -510,7 +510,7 @@ func (ri *rbdImage) open() (*librbd.Image, error) {
image, err := librbd.OpenImage(ri.ioctx, ri.RbdImageName, librbd.NoSnapshot)
if err != nil {
if errors.Is(err, librbd.ErrNotFound) {
err = util.JoinErrors(ErrImageNotFound, err)
err = fmt.Errorf("Failed as %w (internal %w)", ErrImageNotFound, err)
}
return nil, err
@ -896,7 +896,7 @@ func (ri *rbdImage) flatten() error {
// rbd image flatten will fail if the rbd image does not have a parent
parent, pErr := ri.getParentName()
if pErr != nil {
return util.JoinErrors(err, pErr)
return fmt.Errorf("Failed as %w (internal %w)", err, pErr)
}
if parent == "" {
return nil
@ -1448,7 +1448,7 @@ func (ri *rbdImage) deleteSnapshot(ctx context.Context, pOpts *rbdSnapshot) erro
}
err = snap.Remove()
if errors.Is(err, librbd.ErrNotFound) {
return util.JoinErrors(ErrSnapNotFound, err)
return fmt.Errorf("Failed as %w (internal %w)", ErrSnapNotFound, err)
}
return err
@ -1779,7 +1779,7 @@ func lookupRBDImageMetadataStash(metaDataPath string) (rbdImageMetadataStash, er
return imgMeta, fmt.Errorf("failed to read stashed JSON image metadata from path (%s): %w", fPath, err)
}
return imgMeta, util.JoinErrors(ErrMissingStash, err)
return imgMeta, fmt.Errorf("Failed as %w (internal %w)", ErrMissingStash, err)
}
err = json.Unmarshal(encodedBytes, &imgMeta)