]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: include quorum features in quorum_status
authorSage Weil <sage@redhat.com>
Tue, 22 Oct 2019 14:42:26 +0000 (09:42 -0500)
committerSage Weil <sage@redhat.com>
Tue, 22 Oct 2019 14:42:26 +0000 (09:42 -0500)
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>
src/mon/Monitor.cc

index 67779f4b56d41311b51ebe1faee6f67961bd16da..68362eb069cd0a9430c9c6f768050f5a137d7a6c 100644 (file)
@@ -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