From: Sage Weil <sage@redhat.com>
Date: Tue, 22 Oct 2019 14:42:26 +0000 (-0500)
Subject: mon: include quorum features in quorum_status
X-Git-Tag: v15.1.0~1178^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d221996d75a2e78113e99cff627a5330464ff691;p=ceph.git

mon: include quorum features in quorum_status

This is part of mon_status, and qa/standalone/mon/misc.sh mon_features test
uses it.

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

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 67779f4b56d4..68362eb069cd 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -2561,6 +2561,11 @@ void Monitor::_quorum_status(Formatter *f, ostream& ss)
 	mono_clock::now() - quorum_since).count());
   }
 
+  f->open_object_section("features");
+  f->dump_stream("quorum_con") << quorum_con_features;
+  quorum_mon_features.dump(f, "quorum_mon");
+  f->close_section();
+
   f->open_object_section("monmap");
   monmap->dump(f);
   f->close_section(); // monmap