From: Patrick Donnelly Date: Mon, 5 Oct 2020 17:31:23 +0000 (-0700) Subject: qa: unmount all clients before deleting the file system X-Git-Tag: v15.2.8~5^2~1^2~21^2~5 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bae7b858233e641389eb6257fc24b978230feff6;p=ceph.git qa: unmount all clients before deleting the file system Otherwise we have unnecessary timeout waits. Signed-off-by: Patrick Donnelly (cherry picked from commit bc25bd70f2a357046b300135c1b32f1cf120daa5) Conflicts: qa/tasks/cephfs/test_admin.py Notes: delete_all_filesystems method moved --- diff --git a/qa/tasks/cephfs/test_admin.py b/qa/tasks/cephfs/test_admin.py index 7ff6ed536b9a..60198604b395 100644 --- a/qa/tasks/cephfs/test_admin.py +++ b/qa/tasks/cephfs/test_admin.py @@ -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']