mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2025-02-22 10:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

rbd: Update return error massage

Browse Source 
Issue: When delete pv failed, error message shows '*** Directory not empty ***'

the actual failed reason is 'access denied'

This commit ensures ceph-csi return right error massage.

Signed-off-by: ecosysbin <14729934+ecosysbin@user.noreply.gitee.com>
This commit is contained in:
ecosysbin 2025-02-12 12:33:16 +08:00 committed by mergify[bot]
parent e3e6caf83e
commit 0907ba98c4
1 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
internal/rbd/rbd_util.go
View File

@ -606,25 +606,29 @@ func isNotMountPoint(mounter mount.Interface, stagingTargetPath string) (bool, e
// isCephMgrSupported determines if the cluster has support for MGR based operation // isCephMgrSupported determines if the cluster has support for MGR based operation
// depending on the error. // depending on the error.
func isCephMgrSupported(ctx context.Context, clusterID string, err error) bool { func isCephMgrSupported(ctx context.Context, clusterID string, err error) (bool, error) {
switch { switch {
case err == nil: case err == nil:
return true return true, nil
case strings.Contains(err.Error(), rbdTaskRemoveCmdInvalidString): case strings.Contains(err.Error(), rbdTaskRemoveCmdInvalidString):
msg := fmt.Sprintf("cluster with cluster ID (%s) does not support Ceph manager based rbd commands"+
"(minimum ceph version required is v14.2.3)",
clusterID)
log.WarningLog( log.WarningLog(
ctx, ctx,
"cluster with cluster ID (%s) does not support Ceph manager based rbd commands"+ msg)
"(minimum ceph version required is v14.2.3)",
clusterID)
return false return false, errors.New(msg)
case strings.Contains(err.Error(), rbdTaskRemoveCmdAccessDeniedMessage): case strings.Contains(err.Error(), rbdTaskRemoveCmdAccessDeniedMessage):
log.WarningLog(ctx, "access denied to Ceph MGR-based rbd commands on cluster ID (%s)", clusterID) msg := fmt.Sprintf("access denied to Ceph MGR-based rbd commands on cluster ID (%s)",
clusterID)
log.WarningLog(ctx,
msg)
return false return false, errors.New(msg)
} }
return true return true, nil
} }
// ensureImageCleanup finds image in trash and if found removes it // ensureImageCleanup finds image in trash and if found removes it
@ -711,19 +715,23 @@ func (ri *rbdImage) trashRemoveImage(ctx context.Context) error {
_, err = ta.AddTrashRemove(admin.NewImageSpec(ri.Pool, ri.RadosNamespace, ri.ImageID)) _, err = ta.AddTrashRemove(admin.NewImageSpec(ri.Pool, ri.RadosNamespace, ri.ImageID))
rbdCephMgrSupported := isCephMgrSupported(ctx, ri.ClusterID, err) rbdCephMgrSupported, knownErr := isCephMgrSupported(ctx, ri.ClusterID, err)
if rbdCephMgrSupported && err != nil { if rbdCephMgrSupported && err != nil {
log.ErrorLog(ctx, "failed to add task to delete rbd image: %s, %v", ri, err) log.ErrorLog(ctx, "failed to add task to delete rbd image: %s, %v", ri, err)
return err return err
} }
if !rbdCephMgrSupported { if !rbdCephMgrSupported && knownErr != nil {
err = librbd.TrashRemove(ri.ioctx, ri.ImageID, true) trashRemoveError := librbd.TrashRemove(ri.ioctx, ri.ImageID, true)
if err != nil { if trashRemoveError != nil {
log.ErrorLog(ctx, "failed to delete rbd image: %s, %v", ri, err) log.ErrorLog(ctx, "failed to delete rbd image: %s, %v", ri, trashRemoveError)
return err return fmt.Errorf(
"failed to add task to remove image: %w, failed to trash remove image: %w",
knownErr,
trashRemoveError,
)
} }
} else { } else {
log.DebugLog(ctx, "rbd: successfully added task to move image %q with id %q to trash", ri, ri.ImageID) log.DebugLog(ctx, "rbd: successfully added task to move image %q with id %q to trash", ri, ri.ImageID)
@ -858,7 +866,7 @@ func (ri *rbdImage) flattenRbdImage(
} }
_, err = ta.AddFlatten(admin.NewImageSpec(ri.Pool, ri.RadosNamespace, ri.RbdImageName)) _, err = ta.AddFlatten(admin.NewImageSpec(ri.Pool, ri.RadosNamespace, ri.RbdImageName))
rbdCephMgrSupported := isCephMgrSupported(ctx, ri.ClusterID, err) rbdCephMgrSupported, knownErr := isCephMgrSupported(ctx, ri.ClusterID, err)
if rbdCephMgrSupported { if rbdCephMgrSupported {
if err != nil { if err != nil {
// discard flattening error if the image does not have any parent // discard flattening error if the image does not have any parent
@ -875,17 +883,21 @@ func (ri *rbdImage) flattenRbdImage(
} }
log.DebugLog(ctx, "successfully added task to flatten image %q", ri) log.DebugLog(ctx, "successfully added task to flatten image %q", ri)
} }
if !rbdCephMgrSupported { if !rbdCephMgrSupported && knownErr != nil {
log.ErrorLog( log.ErrorLog(
ctx, ctx,
"task manager does not support flatten,image will be flattened once hardlimit is reached: %v", "task manager does not support flatten,image will be flattened once hardlimit is reached: %v",
err) err)
if forceFlatten || depth >= hardlimit { if forceFlatten || depth >= hardlimit {
err := ri.flatten() flattenImageErr := ri.flatten()
if err != nil { if err != nil {
log.ErrorLog(ctx, "rbd failed to flatten image %s %s: %v", ri.Pool, ri.RbdImageName, err) log.ErrorLog(ctx, "rbd failed to flatten image %s %s: %v", ri.Pool, ri.RbdImageName, err)
return err return fmt.Errorf(
"failed to add task to remove image: %w, failed to flatten image: %w",
knownErr,
flattenImageErr,
)
} }
} }
} }