From b60ffacb95639584f9aa4a981f0992ebbd4d4e76 Mon Sep 17 00:00:00 2001 From: songbaisen Date: Tue, 28 Mar 2017 14:41:59 +0800 Subject: [PATCH] mon: show the leader info on mon stat command Signed-off-by:song baisen --- src/mon/Monitor.h | 3 +++ src/mon/MonmapMonitor.cc | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h index 96d8f2582f39..5cdc09971b27 100644 --- a/src/mon/Monitor.h +++ b/src/mon/Monitor.h @@ -558,6 +558,9 @@ private: public: epoch_t get_epoch(); int get_leader() const { return leader; } + string get_leader_name() { + return quorum.empty() ? string() : monmap->get_name(*quorum.begin()); + } const set& get_quorum() const { return quorum; } list get_quorum_names() { list q; diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc index 046cb58eeffd..dea7acf8c4f4 100644 --- a/src/mon/MonmapMonitor.cc +++ b/src/mon/MonmapMonitor.cc @@ -243,8 +243,9 @@ bool MonmapMonitor::preprocess_command(MonOpRequestRef op) if (prefix == "mon stat") { mon->monmap->print_summary(ss); - ss << ", election epoch " << mon->get_epoch() << ", quorum " << mon->get_quorum() - << " " << mon->get_quorum_names(); + ss << ", election epoch " << mon->get_epoch() << ", leader " + << mon->get_leader() << " " << mon->get_leader_name() + << ", quorum " << mon->get_quorum() << " " << mon->get_quorum_names(); rdata.append(ss); ss.str(""); r = 0; -- 2.47.3