mirror of
https://github.com/ceph/ceph
synced 2025-03-06 16:28:28 +00:00
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 <ridave@redhat.com>
This commit is contained in:
parent
c2fb93636e
commit
faa30e03f3
@ -2306,6 +2306,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
|
||||
@ -2330,6 +2335,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
|
||||
@ -2354,6 +2364,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):
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user