From d6082ec8e7f74160d769afb7baaca8ec7d6df907 Mon Sep 17 00:00:00 2001 From: Kotresh HR Date: Fri, 11 Aug 2023 14:16:16 +0530 Subject: [PATCH] qa: Wait for purge to complete in test_volume_info_pending_subvol_deletions Fixes: https://tracker.ceph.com/issues/62278 Signed-off-by: Kotresh HR (cherry picked from commit 72125396d401e87f43534f54e9dfac0c887bf093) --- qa/tasks/cephfs/test_volumes.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qa/tasks/cephfs/test_volumes.py b/qa/tasks/cephfs/test_volumes.py index 2a39b4a262546..0e81638a7278f 100644 --- a/qa/tasks/cephfs/test_volumes.py +++ b/qa/tasks/cephfs/test_volumes.py @@ -656,14 +656,16 @@ class TestVolumes(TestVolumesHelper): subvolname = self._generate_random_subvolume_name() # create subvolume self._fs_cmd("subvolume", "create", self.volname, subvolname, "--mode=777") - # create 3K files of 0.1MB - self._do_subvolume_io(subvolname, number_of_files=3000, file_size=0.1) + # create 3K zero byte files + self._do_subvolume_io(subvolname, number_of_files=3000, file_size=0) # Delete the subvolume self._fs_cmd("subvolume", "rm", self.volname, subvolname) # get volume metadata vol_info = json.loads(self._get_volume_info(self.volname)) self.assertNotEqual(vol_info['pending_subvolume_deletions'], 0, "pending_subvolume_deletions should be 1") + # verify trash dir is clean + self._wait_for_trash_empty() def test_volume_info_without_subvolumegroup(self): """ -- 2.39.5