From 2455352b046ec59b7f1a0b591c60f2c6131ba5b5 Mon Sep 17 00:00:00 2001 From: Rishabh Dave Date: Tue, 7 May 2024 20:20:55 +0530 Subject: [PATCH] qa/cephfs: set joinable on FS before exiting tests in TestFSFail After running TestFSFail, CephFSTestCase.tearDown() fails attempting to unmount CephFS. Set joinable on FS and wait for the MDS to be up before exiting the test. This will ensure that unmounting is successful in teardown. Fixes: https://tracker.ceph.com/issues/65841 Signed-off-by: Rishabh Dave (cherry picked from commit faa30e03f31551a71ebb8330dbbe7005d9ddd559) --- qa/tasks/cephfs/test_admin.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/qa/tasks/cephfs/test_admin.py b/qa/tasks/cephfs/test_admin.py index 5ac104819950c..8a2719fc5c64b 100644 --- a/qa/tasks/cephfs/test_admin.py +++ b/qa/tasks/cephfs/test_admin.py @@ -2165,6 +2165,11 @@ class TestFSFail(TestAdminCommands): retval=1, errmsgs=errmsg) self.run_ceph_cmd(f'fs fail {self.fs.name} --yes-i-really-mean-it') + # Bring and wait for MDS to be up since it is needed for unmounting + # of CephFS in CephFSTestCase.tearDown() to be successful. + self.fs.set_joinable() + self.fs.wait_for_daemons() + def test_with_health_warn_trim(self): ''' Test that, when health warning MDS_TRIM is present for an MDS, command @@ -2189,6 +2194,11 @@ class TestFSFail(TestAdminCommands): retval=1, errmsgs=errmsg) self.run_ceph_cmd(f'fs fail {self.fs.name} --yes-i-really-mean-it') + # Bring and wait for MDS to be up since it is needed for unmounting + # of CephFS in CephFSTestCase.tearDown() to be successful. + self.fs.set_joinable() + self.fs.wait_for_daemons() + def test_with_health_warn_with_2_active_MDSs(self): ''' Test that, when a CephFS has 2 active MDSs and one of them have either @@ -2213,6 +2223,11 @@ class TestFSFail(TestAdminCommands): retval=1, errmsgs=errmsg) self.run_ceph_cmd(f'fs fail {self.fs.name} --yes-i-really-mean-it') + # Bring and wait for MDS to be up since it is needed for unmounting + # of CephFS in CephFSTestCase.tearDown() to be successful. + self.fs.set_joinable() + self.fs.wait_for_daemons() + class TestMDSFail(TestAdminCommands): -- 2.39.5