From a2244a07a4479e7393a75cea91af1f254bad6f57 Mon Sep 17 00:00:00 2001 From: Milind Changire Date: Wed, 22 Nov 2023 15:20:17 +0530 Subject: [PATCH] mgr/volumes: ensure correct init of v1 subvol Signed-off-by: Milind Changire (cherry picked from commit 614d112cff522439c08e554a14472f1f391dd125) Signed-off-by: Milind Changire --- src/pybind/mgr/volumes/fs/operations/versions/subvolume_v1.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b5a10dd6c7f61..6b377ff42c400 100644 --- a/src/pybind/mgr/volumes/fs/operations/versions/subvolume_v1.py +++ b/src/pybind/mgr/volumes/fs/operations/versions/subvolume_v1.py @@ -98,7 +98,6 @@ class SubvolumeV1(SubvolumeBase, SubvolumeTemplate): create_base_dir(self.fs, self.group.path, self.vol_spec.DEFAULT_MODE) # create directory and set attributes self.fs.mkdirs(subvol_path, mode) - self.mark_subvolume() attrs = { 'uid': uid, 'gid': gid, @@ -111,6 +110,7 @@ class SubvolumeV1(SubvolumeBase, SubvolumeTemplate): # persist subvolume metadata qpath = subvol_path.decode('utf-8') self.init_config(SubvolumeV1.VERSION, subvolume_type, qpath, initial_state) + self.mark_subvolume() except (VolumeException, MetadataMgrException, cephfs.Error) as e: try: log.info("cleaning up subvolume with path: {0}".format(self.subvolname)) -- 2.39.5