From: Xiubo Li <xiubli@redhat.com>
Date: Thu, 6 May 2021 08:44:31 +0000 (+0800)
Subject: mds: defer the journal recovered success log
X-Git-Tag: v17.1.0~1951^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c049a2d9e26cc67315b33d9f30125fbdb3bb6531;p=ceph.git

mds: defer the journal recovered success log

Signed-off-by: Xiubo Li <xiubli@redhat.com>
---

diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc
index 1fc4b58f17e82..7238f07bdd957 100644
--- a/src/mds/MDLog.cc
+++ b/src/mds/MDLog.cc
@@ -1055,8 +1055,6 @@ void MDLog::_recovery_thread(MDSContext *completion)
   front_journal->recover(&recover_wait);
   dout(4) << "Waiting for journal " << jp.front << " to recover..." << dendl;
   int recovery_result = recover_wait.wait();
-  dout(4) << "Journal " << jp.front << " recovered." << dendl;
-
   if (recovery_result == -CEPHFS_EBLOCKLISTED) {
     derr << "Blocklisted during journal recovery!  Respawning..." << dendl;
     mds->respawn();
@@ -1067,6 +1065,7 @@ void MDLog::_recovery_thread(MDSContext *completion)
     mds->damaged_unlocked();
     ceph_assert(recovery_result == 0); // Unreachable because damaged() calls respawn()
   }
+  dout(4) << "Journal " << jp.front << " recovered." << dendl;
 
   /* Check whether the front journal format is acceptable or needs re-write */
   if (front_journal->get_stream_format() > JOURNAL_FORMAT_MAX) {