Skip to content

Commit

Permalink
mds: clean up log messages for standby-replay
Browse files Browse the repository at this point in the history
Fixes: https://tracker.ceph.com/issues/37670
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
  • Loading branch information
batrick committed Dec 17, 2018
1 parent 2efb9ce commit af6ab83
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions src/mds/MDSRank.cc
Expand Up @@ -1671,7 +1671,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,
Expand Down Expand Up @@ -1702,7 +1702,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
Expand All @@ -1724,7 +1728,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;
}
Expand Down

0 comments on commit af6ab83

Please sign in to comment.