From 17e644092aa4a882211f7d9afecc9c14143e290b Mon Sep 17 00:00:00 2001 From: Zhi Zhang Date: Thu, 11 Oct 2018 17:12:52 +0800 Subject: [PATCH] mgr/status: fix fs status subcommand did not show standby-replay MDS' perf info Fixes: http://tracker.ceph.com/issues/36399 Signed-off-by: Zhi Zhang (cherry picked from commit 56eabfd81456cfd20ea32e70d55d680610be4de4) --- src/mds/MDLog.cc | 5 ++++- src/pybind/mgr/status/module.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc index e5f20e8bccbe..6498463cb23d 100644 --- a/src/mds/MDLog.cc +++ b/src/mds/MDLog.cc @@ -64,7 +64,8 @@ void MDLog::create_logger() plb.add_u64(l_mdl_evexd, "evexd", "Current expired events"); plb.add_u64(l_mdl_segexg, "segexg", "Expiring segments"); plb.add_u64(l_mdl_segexd, "segexd", "Current expired segments"); - plb.add_u64_counter(l_mdl_replayed, "replayed", "Events replayed"); + plb.add_u64_counter(l_mdl_replayed, "replayed", "Events replayed", + "repl", PerfCountersBuilder::PRIO_INTERESTING); plb.add_time_avg(l_mdl_jlat, "jlat", "Journaler flush latency"); plb.add_u64_counter(l_mdl_evex, "evex", "Total expired events"); plb.add_u64_counter(l_mdl_evtrm, "evtrm", "Trimmed events"); @@ -902,6 +903,8 @@ void MDLog::replay(MDSInternalContextBase *c) if (journaler->get_read_pos() == journaler->get_write_pos()) { dout(10) << "replay - journal empty, done." << dendl; mds->mdcache->trim(); + if (mds->is_standby_replay()) + mds->update_mlogger(); if (c) { c->complete(0); } diff --git a/src/pybind/mgr/status/module.py b/src/pybind/mgr/status/module.py index 0467cf2b0669..5f9e54d767fe 100644 --- a/src/pybind/mgr/status/module.py +++ b/src/pybind/mgr/status/module.py @@ -196,7 +196,7 @@ class Module(MgrModule): dns = self.get_latest("mds", daemon_info['name'], "mds_mem.dn") activity = "Evts: " + self.format_dimless( - self.get_rate("mds", daemon_info['name'], "mds_log.replay"), + self.get_rate("mds", daemon_info['name'], "mds_log.replayed"), 5 ) + "/s" -- 2.47.3