From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 17 Dec 2018 14:51:26 +0000 (-0800)
Subject: mds: clean up log messages for standby-replay
X-Git-Tag: v13.2.5~89^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ef4421983f89787c7385437a3b981ea94b0c804d;p=ceph.git

mds: clean up log messages for standby-replay

Fixes: https://tracker.ceph.com/issues/37670
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit af6ab83b4a3033ff47c9d04c809694c314df35a2)

Conflicts:
	src/mds/MDSRank.cc
		Removed the ConfigValues call g_conf() and kept the
		g_conf. Also, kept 'assert' instead of 'ceph_assert'
		as 'ceph_assert' is not used across all files in mimic.
---

diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc
index 9ef53b14f500..bfd28b0e20ae 100644
--- a/src/mds/MDSRank.cc
+++ b/src/mds/MDSRank.cc
@@ -1716,7 +1716,7 @@ void MDSRank::standby_replay_restart()
 {
   if (standby_replaying) {
     /* Go around for another pass of replaying in standby */
-    dout(4) << "standby_replay_restart (as standby)" << dendl;
+    dout(5) << "Restarting replay as standby-replay" << dendl;
     mdlog->get_journaler()->reread_head_and_probe(
       new C_MDS_StandbyReplayRestartFinish(
         this,
@@ -1747,7 +1747,11 @@ void MDSRank::standby_replay_restart()
 
 void MDSRank::replay_done()
 {
-  dout(1) << "replay_done" << (standby_replaying ? " (as standby)" : "") << dendl;
+  if (!standby_replaying) {
+    dout(1) << "Finished replaying journal" << dendl;
+  } else {
+    dout(5) << "Finished replaying journal as standby-replay" << dendl;
+  }
 
   if (is_standby_replay()) {
     // The replay was done in standby state, and we are still in that state
@@ -1769,7 +1773,7 @@ void MDSRank::replay_done()
 
     // Reformat and come back here
     if (mdlog->get_journaler()->get_stream_format() < g_conf->mds_journal_format) {
-        dout(4) << "reformatting journal on standbyreplay->replay transition" << dendl;
+        dout(4) << "reformatting journal on standby-replay->replay transition" << dendl;
         mdlog->reopen(new C_MDS_BootStart(this, MDS_BOOT_REPLAY_DONE));
         return;
     }