]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa: unmount all clients before deleting the file system
authorPatrick Donnelly <pdonnell@redhat.com>
Mon, 5 Oct 2020 17:31:23 +0000 (10:31 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 23 Oct 2020 03:11:22 +0000 (20:11 -0700)
Otherwise we have unnecessary timeout waits.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit bc25bd70f2a357046b300135c1b32f1cf120daa5)

Conflicts:
qa/tasks/cephfs/test_admin.py

        Notes: delete_all_filesystems method moved

qa/tasks/cephfs/test_admin.py

index 7ff6ed536b9ab4c95290d48319cc0e2e2c3f9c8f..60198604b395b41d4ca2401a93a9352836e23ef8 100644 (file)
@@ -96,6 +96,7 @@ class TestAdminCommands(CephFSTestCase):
         That a new file system warns/fails with an EC default data pool.
         """
 
+        self.mount_a.umount_wait(require_clean=True)
         self.fs.delete_all_filesystems()
         n = "test_new_default_ec"
         self._setup_ec_pools(n)
@@ -114,6 +115,7 @@ class TestAdminCommands(CephFSTestCase):
         That a new file system succeeds with an EC default data pool with --force.
         """
 
+        self.mount_a.umount_wait(require_clean=True)
         self.fs.delete_all_filesystems()
         n = "test_new_default_ec_force"
         self._setup_ec_pools(n)
@@ -124,6 +126,7 @@ class TestAdminCommands(CephFSTestCase):
         That a new file system fails with an EC default data pool without overwrite.
         """
 
+        self.mount_a.umount_wait(require_clean=True)
         self.fs.delete_all_filesystems()
         n = "test_new_default_ec_no_overwrite"
         self._setup_ec_pools(n, overwrites=False)
@@ -151,6 +154,7 @@ class TestAdminCommands(CephFSTestCase):
         """
         That the application metadata set on the pools of a newly created filesystem are as expected.
         """
+        self.mount_a.umount_wait(require_clean=True)
         self.fs.delete_all_filesystems()
         fs_name = "test_fs_new_pool_application"
         keys = ['metadata', 'data']