From: Patrick Donnelly Date: Wed, 26 Aug 2020 17:46:07 +0000 (-0700) Subject: Merge PR #36773 into master X-Git-Tag: wip-pdonnell-testing-20200918.022351~262 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d2a3fcc728c31b25166aeb55c99b9ccf8d4985bb;p=ceph-ci.git Merge PR #36773 into master * refs/pull/36773/head: mgr/volumes: Prevent subvolume recreate if trash is not-empty mgr/volumes: Disallow subvolume group level snapshots mgr/volumes: Add test case to ensure subvolume is marked mgr/volumes: handle idempotent subvolume marks mgr/volumes: Tests amended and added to ensure subvolume trash functionality mgr/volumes: Mark subvolume root with the vxattr ceph.dir.subvolume mgr/volumes: Move incarnations for v2 subvolumes, to subvolume trash mgr/volumes: maintain per subvolume trash directory mgr/volumes: make subvolume_v2::_is_retained() object property Reviewed-by: Venky Shankar Reviewed-by: Patrick Donnelly --- d2a3fcc728c31b25166aeb55c99b9ccf8d4985bb