From: Rishabh Dave Date: Thu, 8 May 2025 15:05:39 +0000 (+0530) Subject: mgr/vol: keep clone source info even after cloning is finished X-Git-Tag: v20.2.1~38^2~30^2~4 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2c9a84a8c949c7ace5d98780819f40ff2c19f544;p=ceph.git mgr/vol: keep clone source info even after cloning is finished Instead of removing the information regarding source of a cloned subvolume from the .meta file after the cloning has finished, keep it as it is as the user may find it useful. Fixes: https://tracker.ceph.com/issues/71266 Signed-off-by: Rishabh Dave (cherry picked from commit bbacfdae1a2e7eb60f91b75852bcd1096b6e3c84) --- diff --git a/src/pybind/mgr/volumes/fs/async_cloner.py b/src/pybind/mgr/volumes/fs/async_cloner.py index 0d02eac9ef07..7f13652a0366 100644 --- a/src/pybind/mgr/volumes/fs/async_cloner.py +++ b/src/pybind/mgr/volumes/fs/async_cloner.py @@ -257,7 +257,6 @@ def handle_clone_complete(fs_client, volspec, volname, index, groupname, subvoln with open_clone_subvol_pair_in_vol(fs_client, volspec, volname, groupname, subvolname) as (subvol0, subvol1, subvol2): subvol1.detach_snapshot(subvol2, index) - subvol0.remove_clone_source(flush=True) except (MetadataMgrException, VolumeException) as e: log.error("failed to detach clone from snapshot: {0}".format(e)) return (None, True) diff --git a/src/pybind/mgr/volumes/fs/operations/versions/subvolume_v1.py b/src/pybind/mgr/volumes/fs/operations/versions/subvolume_v1.py index e04e6eb51c75..e32ab1d1f501 100644 --- a/src/pybind/mgr/volumes/fs/operations/versions/subvolume_v1.py +++ b/src/pybind/mgr/volumes/fs/operations/versions/subvolume_v1.py @@ -138,11 +138,6 @@ class SubvolumeV1(SubvolumeBase, SubvolumeTemplate): if flush: self.metadata_mgr.flush() - def remove_clone_source(self, flush=False): - self.metadata_mgr.remove_section("source") - if flush: - self.metadata_mgr.flush() - def add_clone_failure(self, errno, error_msg): try: self.metadata_mgr.add_section(MetadataManager.CLONE_FAILURE_SECTION)