rbd: consider ErrPermissionDenied for vol

Incase of RDR with restricted access the ceph user will not have access to all the objects or all the pools where mapping exists This commits add a check to continue to get the volume if there is a permission error Signed-off-by: Madhu Rajanna <[email protected]>
ceph · Oct 1, 2024 · f02ca97 · f02ca97
1 parent 5aec13d
commit f02ca97
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/internal/rbd/rbd_util.go b/internal/rbd/rbd_util.go
@@ -1215,7 +1215,7 @@ func GenVolFromVolID(
 
 	vol, err = generateVolumeFromVolumeID(ctx, volumeID, vi, cr, secrets)
 	if !errors.Is(err, util.ErrKeyNotFound) && !errors.Is(err, util.ErrPoolNotFound) &&
-		!errors.Is(err, ErrImageNotFound) {
+		!errors.Is(err, ErrImageNotFound) && !errors.Is(err, rados.ErrPermissionDenied) {
 		return vol, err
 	}
 
@@ -1227,7 +1227,7 @@ func GenVolFromVolID(
 	if mapping != nil {
 		rbdVol, vErr := generateVolumeFromMapping(ctx, mapping, volumeID, vi, cr, secrets)
 		if !errors.Is(vErr, util.ErrKeyNotFound) && !errors.Is(vErr, util.ErrPoolNotFound) &&
-			!errors.Is(vErr, ErrImageNotFound) {
+			!errors.Is(vErr, ErrImageNotFound) && !errors.Is(vErr, rados.ErrPermissionDenied) {
 			return rbdVol, vErr
 		}
 	}
@@ -1281,7 +1281,7 @@ func generateVolumeFromMapping(
 					nvi.LocationID = pID
 					vol, err = generateVolumeFromVolumeID(ctx, volumeID, nvi, cr, secrets)
 					if !errors.Is(err, util.ErrKeyNotFound) && !errors.Is(err, util.ErrPoolNotFound) &&
-						!errors.Is(err, ErrImageNotFound) {
+						!errors.Is(err, ErrImageNotFound) && !errors.Is(err, rados.ErrPermissionDenied) {
 						return vol, err
 					}
 				}