]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #36773 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Wed, 26 Aug 2020 17:46:07 +0000 (10:46 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Wed, 26 Aug 2020 17:46:07 +0000 (10:46 -0700)
* 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 <vshankar@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
qa/suites/fs/basic_functional/tasks/volumes.yaml
qa/tasks/cephfs/test_volumes.py

Simple merge