From: Joao Eduardo Luis <joao@suse.de>
Date: Tue, 9 Feb 2016 19:30:45 +0000 (+0000)
Subject: mon: Monitor: dump features on 'mon_status'
X-Git-Tag: v11.1.0~400^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5c28322f68f01d1f481dd1ed7f2430992abf566e;p=ceph.git

mon: Monitor: dump features on 'mon_status'

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
---

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 2585914754d0..a6c64ab1f0ee 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -2109,6 +2109,14 @@ void Monitor::get_mon_status(Formatter *f, ostream& ss)
 
   f->close_section(); // quorum
 
+  f->open_object_section("features");
+  f->dump_stream("required_con") << required_features;
+  mon_feature_t req_mon_features = get_required_mon_features();
+  req_mon_features.dump(f, "required_mon");
+  f->dump_stream("quorum_con") << quorum_con_features;
+  quorum_mon_features.dump(f, "quorum_mon");
+  f->close_section(); // features
+
   f->open_array_section("outside_quorum");
   for (set<string>::iterator p = outside_quorum.begin(); p != outside_quorum.end(); ++p)
     f->dump_string("mon", *p);