From: Sage Weil <sage@inktank.com>
Date: Tue, 23 Jul 2013 21:42:55 +0000 (-0700)
Subject: mon: add quorum_names to quorum_status command output
X-Git-Tag: v0.67-rc2~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=612a9b35c0065efa036cc0cd49196cec8d4e53d8;p=ceph.git

mon: add quorum_names to quorum_status command output

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 957f0c7f5ca2..9492f7c91687 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -1589,6 +1589,14 @@ void Monitor::_quorum_status(Formatter *f, ostream& ss)
     f->dump_int("mon", *p);
   f->close_section(); // quorum
 
+  set<string> quorum_names = get_quorum_names();
+  f->open_array_section("quorum_names");
+  for (set<string>::iterator p = quorum_names.begin(); p != quorum_names.end(); ++p)
+    f->dump_string("mon", *p);
+  f->close_section(); // quorum_names
+
+  f->dump_string("quorum_leader_name", quorum.empty() ? string() : monmap->get_name(*quorum.begin()));
+
   f->open_object_section("monmap");
   monmap->dump(f);
   f->close_section(); // monmap