Skip to content

Commit ae3faac

Browse files
committed
qa/cephfs: fix TestRenameCommand and unmount the clinet before failing fs
We should else bring and wait for MDS to be up since it is needed for unmounting of CephFS in CephFSTestCase.tearDown() to be successful, or just unmount the mountpoints before failing the filesystem. Since the mountpoint won't be used in later tests so we just unmount it. Fixes: https://tracker.ceph.com/issues/66946 Signed-off-by: Xiubo Li <[email protected]>
1 parent 56744af commit ae3faac

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

qa/tasks/cephfs/test_admin.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -994,6 +994,9 @@ def test_fs_rename_fails_without_yes_i_really_mean_it_flag(self):
994994
"""
995995
That renaming a file system without '--yes-i-really-mean-it' flag fails.
996996
"""
997+
# Failing the file system breaks this mount
998+
self.mount_a.umount_wait(require_clean=True)
999+
9971000
self.run_ceph_cmd(f'fs fail {self.fs.name}')
9981001
self.run_ceph_cmd(f'fs set {self.fs.name} refuse_client_session true')
9991002
sleep(5)
@@ -1016,6 +1019,9 @@ def test_fs_rename_fails_for_non_existent_fs(self):
10161019
"""
10171020
That renaming a non-existent file system fails.
10181021
"""
1022+
# Failing the file system breaks this mount
1023+
self.mount_a.umount_wait(require_clean=True)
1024+
10191025
self.run_ceph_cmd(f'fs fail {self.fs.name}')
10201026
self.run_ceph_cmd(f'fs set {self.fs.name} refuse_client_session true')
10211027
sleep(5)
@@ -1036,6 +1042,9 @@ def test_fs_rename_fails_new_name_already_in_use(self):
10361042
"""
10371043
self.fs2 = self.mds_cluster.newfs(name='cephfs2', create=True)
10381044

1045+
# let's unmount the client before failing the FS
1046+
self.mount_a.umount_wait(require_clean=True)
1047+
10391048
self.run_ceph_cmd(f'fs fail {self.fs.name}')
10401049
self.run_ceph_cmd(f'fs set {self.fs.name} refuse_client_session true')
10411050
sleep(5)
@@ -1059,6 +1068,9 @@ def test_fs_rename_fails_with_mirroring_enabled(self):
10591068
orig_fs_name = self.fs.name
10601069
new_fs_name = 'new_cephfs'
10611070

1071+
# let's unmount the client before failing the FS
1072+
self.mount_a.umount_wait(require_clean=True)
1073+
10621074
self.run_ceph_cmd(f'fs mirror enable {orig_fs_name}')
10631075
self.run_ceph_cmd(f'fs fail {self.fs.name}')
10641076
self.run_ceph_cmd(f'fs set {self.fs.name} refuse_client_session true')

0 commit comments

Comments
 (0)