From 7abad7dba0592c0be338ffd4ba70deee9f82d107 Mon Sep 17 00:00:00 2001 From: Venky Shankar Date: Wed, 19 Feb 2020 09:19:31 -0500 Subject: [PATCH] test: verify purge queue w/ large number of subvolumes Fixes: http://tracker.ceph.com/issues/44282 Signed-off-by: Venky Shankar (cherry picked from commit 92b20089369b0d549c8c337a60bb93ae24c7b66a) --- qa/tasks/cephfs/test_volumes.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/qa/tasks/cephfs/test_volumes.py b/qa/tasks/cephfs/test_volumes.py index 22c284c08661c..59a0825dda32d 100644 --- a/qa/tasks/cephfs/test_volumes.py +++ b/qa/tasks/cephfs/test_volumes.py @@ -1221,23 +1221,23 @@ class TestVolumes(CephFSTestCase): raise RuntimeError("Error creating or listing subvolume group snapshots") def test_async_subvolume_rm(self): - subvolume = self._generate_random_subvolume_name() - - # create subvolume - self._fs_cmd("subvolume", "create", self.volname, subvolume) + subvolumes = self._generate_random_subvolume_name(100) - # fill subvolume w/ some data - self._do_subvolume_io(subvolume) + # create subvolumes + for subvolume in subvolumes: + self._fs_cmd("subvolume", "create", self.volname, subvolume) + self._do_subvolume_io(subvolume, number_of_files=10) self.mount_a.umount_wait() - # remove subvolume - self._fs_cmd("subvolume", "rm", self.volname, subvolume) + # remove subvolumes + for subvolume in subvolumes: + self._fs_cmd("subvolume", "rm", self.volname, subvolume) self.mount_a.mount() # verify trash dir is clean - self._wait_for_trash_empty() + self._wait_for_trash_empty(timeout=300) def test_subvolume_upgrade(self): """ -- 2.39.5