From: Greg Farnum <gfarnum@redhat.com>
Date: Thu, 29 Oct 2020 06:06:24 +0000 (+0000)
Subject: mon: monmap: print out disallowed_leaders in text form, when non-empty
X-Git-Tag: v16.1.0~657^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0fd65db3debb34c9d7d0d52394e2073140801b76;p=ceph.git

mon: monmap: print out disallowed_leaders in text form, when non-empty

This is already dumped in the programmatic output, but it got left out of
the direct-user-facing calls (as in "ceph mon dump").

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
---

diff --git a/src/mon/MonMap.cc b/src/mon/MonMap.cc
index fe417ba44fdd8..be0a6c678916e 100644
--- a/src/mon/MonMap.cc
+++ b/src/mon/MonMap.cc
@@ -369,6 +369,9 @@ void MonMap::print(ostream& out) const
   out << "min_mon_release " << to_integer<unsigned>(min_mon_release)
       << " (" << min_mon_release << ")\n";
   out << "election_strategy: " << strategy << "\n";
+  if (disallowed_leaders.size()) {
+    out << "disallowed_leaders" << disallowed_leaders << "\n";
+  }
   unsigned i = 0;
   for (auto p = ranks.begin(); p != ranks.end(); ++p) {
     out << i++ << ": " << get_addrs(*p) << " mon." << *p << "\n";