From: Patrick Donnelly Date: Fri, 15 Jan 2021 19:53:02 +0000 (-0800) Subject: Merge PR #38160 into master X-Git-Tag: v17.0.0~49 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=60510411be8a8361ef15d1358afdbad6861c7a6c;p=ceph.git Merge PR #38160 into master * refs/pull/38160/head: doc/mgr/volumes: Document 'fs subvolume authorized_list' cli qa: Add tests for list auth-ids of a subvolume mgr/volumes: Update the 'volumes' key to 'subvolumes' in auth metadata file mgr/volumes: Optionally authorize existing auth-ids mgr/volumes: Preserve existing caps while authorize/deauthorize auth-id mgr/volumes: Disallow authorize existing auth_id mgr/volumes: Add subvolume authorized_list command mgr/volumes: Add tenant_id option to subvolume authorize mgr/volumes: Persist auth and subvolume metadata Reviewed-by: Ramana Raja Reviewed-by: Patrick Donnelly --- 60510411be8a8361ef15d1358afdbad6861c7a6c diff --cc src/pybind/mgr/volumes/fs/operations/versions/subvolume_v1.py index 42c9783b2c19d,e6036cd914c00..f4fbe9ff8ee97 --- a/src/pybind/mgr/volumes/fs/operations/versions/subvolume_v1.py +++ b/src/pybind/mgr/volumes/fs/operations/versions/subvolume_v1.py @@@ -16,8 -18,9 +18,9 @@@ from ..template import SubvolumeTemplat from ..snapshot_util import mksnap, rmsnap from ..access import allow_access, deny_access from ...exception import IndexException, OpSmException, VolumeException, MetadataMgrException -from ...fs_util import listdir +from ...fs_util import listsnaps, is_inherited_snap from ..template import SubvolumeOpType + from ..group import Group from ..clone_index import open_clone_index, create_clone_index