From: Patrick Donnelly Date: Wed, 29 Jan 2025 20:27:20 +0000 (-0500) Subject: qa: make the directory non-empty to force migration X-Git-Tag: v20.0.0~226^2~9 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bc196b7e63ac2f06b6b6d89981ff156c8f3900f0;p=ceph.git qa: make the directory non-empty to force migration rank 0 will not migrate the directory until it is non-empty. And creating a file and promptly deleting is not reliable; the vstart_runner.py test will just loop forever. Signed-off-by: Patrick Donnelly --- diff --git a/qa/tasks/cephfs/test_data_scan.py b/qa/tasks/cephfs/test_data_scan.py index 6c75d214457..64f8d691c4f 100644 --- a/qa/tasks/cephfs/test_data_scan.py +++ b/qa/tasks/cephfs/test_data_scan.py @@ -722,10 +722,10 @@ class TestDataScan(CephFSTestCase): mds0_id = active_mds_names[0] mds1_id = active_mds_names[1] - self.mount_a.run_shell(["mkdir", "dir1"]) + self.mount_a.run_shell_payload("mkdir -p dir1/dir2") dir_ino = self.mount_a.path_to_ino("dir1") self.mount_a.setfattr("dir1", "ceph.dir.pin", "1") - # wait for subtree migration + self._wait_subtrees([('/dir1', 1)], rank=1) file_ino = 0; while True: