]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: defer the journal recovered success log 41267/head
authorXiubo Li <xiubli@redhat.com>
Thu, 6 May 2021 08:44:31 +0000 (16:44 +0800)
committerXiubo Li <xiubli@redhat.com>
Mon, 10 May 2021 06:25:41 +0000 (14:25 +0800)
Signed-off-by: Xiubo Li <xiubli@redhat.com>
src/mds/MDLog.cc

index 1fc4b58f17e8281ffab939f88a67a55be5b06576..7238f07bdd957691d6b26d97e208ec26d3250591 100644 (file)
@@ -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) {