From 1e34788f9af6fd02288daddc659e24834299bafd Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Fri, 12 Nov 2021 23:05:02 +0000 Subject: [PATCH] mon: MonMap: display disallowed_leaders whenever they're set In c59a6f89465e3933631afa2ba92e8c1ae1c31c06, I erroneously changed the CLI display output so it would only dump disallowed_leaders in stretch mode. But they can also be set in connectivity or disallow election modes and we want users to be able to see them then as well. Fixes: https://tracker.ceph.com/issues/53258 Signed-off-by: Greg Farnum --- src/mon/MonMap.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/mon/MonMap.cc b/src/mon/MonMap.cc index 43236a6364176..344278eaa57f4 100644 --- a/src/mon/MonMap.cc +++ b/src/mon/MonMap.cc @@ -383,6 +383,9 @@ void MonMap::print(ostream& out) const if (stretch_mode_enabled) { out << "stretch_mode_enabled " << stretch_mode_enabled << "\n"; out << "tiebreaker_mon " << tiebreaker_mon << "\n"; + } + if (stretch_mode_enabled || + !disallowed_leaders.empty()) { out << "disallowed_leaders " << disallowed_leaders << "\n"; } unsigned i = 0; -- 2.39.5