From 19221d17a7d8256f449d00d30f2d165d4c268ece Mon Sep 17 00:00:00 2001 From: neeraj pratap singh Date: Mon, 25 Sep 2023 16:32:31 +0530 Subject: [PATCH] mgr/volumes: fix `subvolume group rm` error message Currently, if we try to delete subvolumegroup using `fs subvolumegroup rm` when there's one or more subvolume(s) present under that subvolumegroup we see the error something like : `Error ENOTEMPTY: error in rmdir /volumes/group1` which causes confusion. Make it more descriptive Fixes: https://tracker.ceph.com/issues/62968 Signed-off-by: Neeraj Pratap Singh (cherry picked from commit fca554cee093771646a0c4a37827d7fe3fe95a4a) --- src/pybind/mgr/volumes/fs/operations/group.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pybind/mgr/volumes/fs/operations/group.py b/src/pybind/mgr/volumes/fs/operations/group.py index 8b40610332dc..efc10e0797aa 100644 --- a/src/pybind/mgr/volumes/fs/operations/group.py +++ b/src/pybind/mgr/volumes/fs/operations/group.py @@ -269,6 +269,9 @@ def remove_group(fs, vol_spec, groupname): except cephfs.Error as e: if e.args[0] == errno.ENOENT: raise VolumeException(-errno.ENOENT, "subvolume group '{0}' does not exist".format(groupname)) + elif e.args[0] == errno.ENOTEMPTY: + raise VolumeException(-errno.ENOTEMPTY, f"subvolume group {groupname} contains subvolume(s) " + "or retained snapshots of deleted subvolume(s)") raise VolumeException(-e.args[0], e.args[1]) -- 2.47.3