From: Rishabh Dave Date: Mon, 8 Dec 2025 12:37:09 +0000 (+0530) Subject: qa/cephfs: increase number of files to cloned in test_clone_stats.py X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ff75759ed354bb84e0e0b271122a1eb65dcee1c4;p=ceph-ci.git qa/cephfs: increase number of files to cloned in test_clone_stats.py There's a race condition between cloning operation and clone progress reporter thread to open the subvolume, former does so to copy/clone files and latter to get details of the source and destination subvolume. A low number of files in the snapshot gives clone progress reporter thread less or no chance to fetch and process the details needed to display the progress bar. This causes tests to fails when progress bar isn't displayed in the output of "ceph status" output. Increasing the number of files will give clone progress reporter more time to display the progress bar and therefore these unnecessary test failures wlll reduce/stop. This failure wasn't seen earlier because Python code was being used to copy files which was comparatively slow (compared to C++ code that was merged to copy files as a part of fscrypt work) which allowed enough time to clone progress reporter thread to process stats and display clone progress bar. Fixes: https://tracker.ceph.com/issues/74082 Signed-off-by: Rishabh Dave --- diff --git a/qa/tasks/cephfs/volumes/test_clone_stats.py b/qa/tasks/cephfs/volumes/test_clone_stats.py index ce4c4709829..5b5c41ee32f 100644 --- a/qa/tasks/cephfs/volumes/test_clone_stats.py +++ b/qa/tasks/cephfs/volumes/test_clone_stats.py @@ -332,7 +332,7 @@ class TestCloneProgressReporter(CloneProgressReporterHelper): c = 'ss1clone1' self.run_ceph_cmd(f'fs subvolume create {v} {sv} --mode=777') - size = self._do_subvolume_io(sv, None, None, 3, 1024) + size = self._do_subvolume_io(sv, None, None, 30, 100) self.run_ceph_cmd(f'fs subvolume snapshot create {v} {sv} {ss}') self.wait_till_rbytes_is_right(v, sv, size) @@ -369,7 +369,7 @@ class TestCloneProgressReporter(CloneProgressReporterHelper): c = 'ss1clone1' self.run_ceph_cmd(f'fs subvolume create {v} {sv} --mode=777') - size = self._do_subvolume_io(sv, None, None, 10, 1024) + size = self._do_subvolume_io(sv, None, None, 100, 100) self.run_ceph_cmd(f'fs subvolume snapshot create {v} {sv} {ss}') self.wait_till_rbytes_is_right(v, sv, size) @@ -417,7 +417,7 @@ class TestCloneProgressReporter(CloneProgressReporterHelper): self.run_ceph_cmd(f'fs subvolumegroup create {v} {group}') self.run_ceph_cmd(f'fs subvolume create {v} {sv} {group} --mode=777') - size = self._do_subvolume_io(sv, group, None, 10, 1024) + size = self._do_subvolume_io(sv, group, None, 100, 100) self.run_ceph_cmd(f'fs subvolume snapshot create {v} {sv} {ss} {group}') self.wait_till_rbytes_is_right(v, sv, size, group) @@ -469,7 +469,7 @@ class TestCloneProgressReporter(CloneProgressReporterHelper): self.config_set('mds', 'mds_snap_rstat', 'true') self.run_ceph_cmd(f'fs subvolume create {v} {sv} --mode=777') - size = self._do_subvolume_io(sv, None, None, 10, 1024) + size = self._do_subvolume_io(sv, None, None, 100, 100) self.run_ceph_cmd(f'fs subvolume snapshot create {v} {sv} {ss}') self.wait_till_rbytes_is_right(v, sv, size) @@ -513,7 +513,7 @@ class TestCloneProgressReporter(CloneProgressReporterHelper): c = self._gen_subvol_clone_name(4) self.run_ceph_cmd(f'fs subvolume create {v} {sv} --mode=777') - size = self._do_subvolume_io(sv, None, None, 10, 1024) + size = self._do_subvolume_io(sv, None, None, 100, 100) self.run_ceph_cmd(f'fs subvolume snapshot create {v} {sv} {ss}') self.wait_till_rbytes_is_right(v, sv, size) @@ -563,7 +563,7 @@ class TestCloneProgressReporter(CloneProgressReporterHelper): self.config_set('mgr', 'mgr/volumes/snapshot_clone_no_wait', 'false') self.run_ceph_cmd(f'fs subvolume create {v} {sv} --mode=777') - size = self._do_subvolume_io(sv, None, None, 3, 1024) + size = self._do_subvolume_io(sv, None, None, 30, 100) self.run_ceph_cmd(f'fs subvolume snapshot create {v} {sv} {ss}') self.wait_till_rbytes_is_right(v, sv, size) @@ -614,7 +614,7 @@ class TestCloneProgressReporter(CloneProgressReporterHelper): self.config_set('mgr', 'mgr/volumes/snapshot_clone_no_wait', 'false') self.run_ceph_cmd(f'fs subvolume create {v} {sv} --mode=777') - size = self._do_subvolume_io(sv, None, None, 3, 1024) + size = self._do_subvolume_io(sv, None, None, 30, 100) self.run_ceph_cmd(f'fs subvolume snapshot create {v} {sv} {ss}') self.wait_till_rbytes_is_right(v, sv, size) @@ -673,7 +673,7 @@ class TestCloneProgressReporter(CloneProgressReporterHelper): sv_path = self.get_ceph_cmd_stdout(f'fs subvolume getpath {v} {sv}') sv_path = sv_path[1:] - size = self._do_subvolume_io(sv, None, None, 3, 1024) + size = self._do_subvolume_io(sv, None, None, 30, 100) self.run_ceph_cmd(f'fs subvolume snapshot create {v} {sv} {ss}') self.wait_till_rbytes_is_right(v, sv, size) @@ -716,7 +716,7 @@ class TestCloneProgressReporter(CloneProgressReporterHelper): sv_path = self.get_ceph_cmd_stdout(f'fs subvolume getpath {v} {sv}') sv_path = sv_path[1:] - size = self._do_subvolume_io(sv, None, None, 3, 1024) + size = self._do_subvolume_io(sv, None, None, 30, 100) self.run_ceph_cmd(f'fs subvolume snapshot create {v} {sv} {ss}') self.wait_till_rbytes_is_right(v, sv, size) @@ -763,7 +763,7 @@ class TestCloneProgressReporter(CloneProgressReporterHelper): sv_path = self.get_ceph_cmd_stdout(f'fs subvolume getpath {v} {sv}') sv_path = sv_path[1:] - size = self._do_subvolume_io(sv, None, None, 3, 1024) + size = self._do_subvolume_io(sv, None, None, 30, 100) self.run_ceph_cmd(f'fs subvolume snapshot create {v} {sv} {ss}') self.wait_till_rbytes_is_right(v, sv, size) @@ -814,7 +814,7 @@ class TestOngoingClonesCounter(CloneProgressReporterHelper): sv_path = self.get_ceph_cmd_stdout(f'fs subvolume getpath {v} {sv}') sv_path = sv_path[1:] - size = self._do_subvolume_io(sv, None, None, 3, 1024) + size = self._do_subvolume_io(sv, None, None, 30, 100) self.run_ceph_cmd(f'fs subvolume snapshot create {v} {sv} {ss}') self.wait_till_rbytes_is_right(v, sv, size)