Merge pull request ceph#58583 from lxbsz/wip-66946

qa/cephfs: fix TestRenameCommand and unmount the clinet before failin…

Reviewed-by: Venky Shankar <[email protected]>

Author: vshankar

qa/tasks/cephfs/test_admin.py

@@ -994,6 +994,9 @@ def test_fs_rename_fails_without_yes_i_really_mean_it_flag(self):
         """
         That renaming a file system without '--yes-i-really-mean-it' flag fails.
         """
+        # Failing the file system breaks this mount
+        self.mount_a.umount_wait(require_clean=True)
+
         self.run_ceph_cmd(f'fs fail {self.fs.name}')
         self.run_ceph_cmd(f'fs set {self.fs.name} refuse_client_session true')
         sleep(5)
@@ -1016,6 +1019,9 @@ def test_fs_rename_fails_for_non_existent_fs(self):
         """
         That renaming a non-existent file system fails.
         """
+        # Failing the file system breaks this mount
+        self.mount_a.umount_wait(require_clean=True)
+
         self.run_ceph_cmd(f'fs fail {self.fs.name}')
         self.run_ceph_cmd(f'fs set {self.fs.name} refuse_client_session true')
         sleep(5)
@@ -1036,6 +1042,9 @@ def test_fs_rename_fails_new_name_already_in_use(self):
         """
         self.fs2 = self.mds_cluster.newfs(name='cephfs2', create=True)
 
+        # let's unmount the client before failing the FS
+        self.mount_a.umount_wait(require_clean=True)
+
         self.run_ceph_cmd(f'fs fail {self.fs.name}')
         self.run_ceph_cmd(f'fs set {self.fs.name} refuse_client_session true')
         sleep(5)
@@ -1059,6 +1068,9 @@ def test_fs_rename_fails_with_mirroring_enabled(self):
         orig_fs_name = self.fs.name
         new_fs_name = 'new_cephfs'
 
+        # let's unmount the client before failing the FS
+        self.mount_a.umount_wait(require_clean=True)
+
         self.run_ceph_cmd(f'fs mirror enable {orig_fs_name}')
         self.run_ceph_cmd(f'fs fail {self.fs.name}')
         self.run_ceph_cmd(f'fs set {self.fs.name} refuse_client_session true')