From: songbaisen <song.baisen@zte.com.cn>
Date: Tue, 28 Mar 2017 06:41:59 +0000 (+0800)
Subject: mon: show the leader info on mon stat command
X-Git-Tag: ses5-milestone8^2~7^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b60ffacb95639584f9aa4a981f0992ebbd4d4e76;p=ceph.git

mon: show the leader info on mon stat command

Signed-off-by:song baisen <song.baisen@zte.com.cn>
---

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<int>& get_quorum() const { return quorum; }
   list<string> get_quorum_names() {
     list<string> 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;