From: Xiubo Li <xiubli@redhat.com>
Date: Fri, 5 May 2023 10:41:54 +0000 (+0800)
Subject: qa: fix journal flush failure issue due to the MDS daemon crashes
X-Git-Tag: v16.2.14~44^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a817f7502125db6a62afdfd34020ce0d0a83d635;p=ceph.git

qa: fix journal flush failure issue due to the MDS daemon crashes

After the MDS daemon crashing, the journal flush request will fail.

Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit d851a9475c30d0b6fa4418c38d04fd602bc785eb)
---

diff --git a/qa/tasks/cephfs/test_misc.py b/qa/tasks/cephfs/test_misc.py
index 4fde5fb8f5e50..c8b6741c44014 100644
--- a/qa/tasks/cephfs/test_misc.py
+++ b/qa/tasks/cephfs/test_misc.py
@@ -437,14 +437,15 @@ class TestSkipReplayInoTable(CephFSTestCase):
         # This will make the MDS crash, since we only have one MDS in the
         # cluster and without the "wait=False" it will stuck here forever.
         self.mount_a.run_shell(["mkdir", "test_alloc_ino/dir1"], wait=False)
-        self.fs.mds_asok(['flush', 'journal'])
+
+        # sleep 10 seconds to make sure the journal logs are flushed and
+        # the mds crashes
+        time.sleep(10)
 
         # Now set the mds config to skip replaying the inotable
         self.fs.set_ceph_conf('mds', 'mds_inject_skip_replaying_inotable', True)
         self.fs.set_ceph_conf('mds', 'mds_wipe_sessions', True)
 
-        # sleep 5 seconds to make sure the journal log is flushed and applied
-        time.sleep(5)
         self.fs.mds_restart()
         # sleep 5 seconds to make sure the mds tell command won't stuck
         time.sleep(5)