]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
test: verify purge queue w/ large number of subvolumes 33526/head
authorVenky Shankar <vshankar@redhat.com>
Wed, 19 Feb 2020 14:19:31 +0000 (09:19 -0500)
committerVenky Shankar <vshankar@redhat.com>
Tue, 25 Feb 2020 04:10:08 +0000 (23:10 -0500)
Fixes: http://tracker.ceph.com/issues/44282
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 92b20089369b0d549c8c337a60bb93ae24c7b66a)

qa/tasks/cephfs/test_volumes.py

index 22c284c08661cae5de950a028e936ffe6cab80df..59a0825dda32d094e12c021211ece18145500be7 100644 (file)
@@ -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):
         """