From 7b682accf41999aa8495ba61d072a26c86a9d0de Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Mon, 17 Dec 2018 06:51:26 -0800 Subject: [PATCH] mds: clean up log messages for standby-replay Fixes: https://tracker.ceph.com/issues/37670 Signed-off-by: Patrick Donnelly (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 luminous. --- src/mds/MDSRank.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc index ce82e3707e5..0577c6a2fff 100644 --- a/src/mds/MDSRank.cc +++ b/src/mds/MDSRank.cc @@ -1656,7 +1656,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, @@ -1685,7 +1685,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 @@ -1707,7 +1711,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; } -- 2.47.3