From: Venky Shankar <vshankar@redhat.com>
Date: Wed, 19 Feb 2020 14:19:31 +0000 (-0500)
Subject: test: verify purge queue w/ large number of subvolumes
X-Git-Tag: v15.1.1~277^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F33413%2Fhead;p=ceph.git

test: verify purge queue w/ large number of subvolumes

Fixes: http://tracker.ceph.com/issues/44207
Signed-off-by: Venky Shankar <vshankar@redhat.com>
---

diff --git a/qa/tasks/cephfs/test_volumes.py b/qa/tasks/cephfs/test_volumes.py
index 6344f2565b10..dee4ba41941d 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_mgr_eviction(self):
         # unmount any cephfs mounts