import ceph quincy 17.2.1

[ceph.git] / ceph / src / pybind / mgr / volumes / fs / operations / versions / subvolume_v2.py

diff --git a/ceph/src/pybind/mgr/volumes/fs/operations/versions/subvolume_v2.py b/ceph/src/pybind/mgr/volumes/fs/operations/versions/subvolume_v2.py
index a827bb7a00e5e78c811db83012e7f9ae70ff5d51..bfebd24e3bf225c71ed02d2598038cb9ee6b6e27 100644 (file)
--- a/ceph/src/pybind/mgr/volumes/fs/operations/versions/subvolume_v2.py
+++ b/ceph/src/pybind/mgr/volumes/fs/operations/versions/subvolume_v2.py
@@ -352,7 +352,7 @@ class SubvolumeV2(SubvolumeV1):
         # machine which removes the entry from the index. Hence, it's safe to removed clone with
         # force option for both.
         acceptable_rm_clone_states = [SubvolumeStates.STATE_COMPLETE, SubvolumeStates.STATE_CANCELED,
-                                      SubvolumeStates.STATE_FAILED]
+                                      SubvolumeStates.STATE_FAILED, SubvolumeStates.STATE_RETAINED]
         if subvol_state not in acceptable_rm_clone_states:
             return False
         return True
@@ -372,6 +372,7 @@ class SubvolumeV2(SubvolumeV1):
                 return
         if self.state != SubvolumeStates.STATE_RETAINED:
             self.trash_incarnation_dir()
+            self.metadata_mgr.remove_section(MetadataManager.USER_METADATA_SECTION)
             self.metadata_mgr.update_global_section(MetadataManager.GLOBAL_META_KEY_PATH, "")
             self.metadata_mgr.update_global_section(MetadataManager.GLOBAL_META_KEY_STATE, SubvolumeStates.STATE_RETAINED.value)
             self.metadata_mgr.flush()