]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
qa: Wait for purge to complete in test_volume_info_pending_subvol_deletions 53911/head
authorKotresh HR <khiremat@redhat.com>
Fri, 11 Aug 2023 08:46:16 +0000 (14:16 +0530)
committerKotresh HR <khiremat@redhat.com>
Tue, 10 Oct 2023 10:20:46 +0000 (15:50 +0530)
Fixes: https://tracker.ceph.com/issues/62278
Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit 72125396d401e87f43534f54e9dfac0c887bf093)

qa/tasks/cephfs/test_volumes.py

index ecbba75c979fb6b80d4c18df6b58398783bbcab2..6161abe2ef825a935fa11570118848683dca841b 100644 (file)
@@ -668,14 +668,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):
         """