From a71ddb0b7d5c87ed03d464bc17e4834dc5a01125 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 5 Mar 2014 14:28:49 -0800 Subject: [PATCH] mon: make quorum list (by name) be in quorum order Fixes: #7562 Signed-off-by: Sage Weil --- src/mon/Monitor.cc | 6 +++--- src/mon/Monitor.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index 64e7f3f3fd7cb..5697d0e97a5d1 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -1717,9 +1717,9 @@ void Monitor::_quorum_status(Formatter *f, ostream& ss) f->dump_int("mon", *p); f->close_section(); // quorum - set quorum_names = get_quorum_names(); + list quorum_names = get_quorum_names(); f->open_array_section("quorum_names"); - for (set::iterator p = quorum_names.begin(); p != quorum_names.end(); ++p) + for (list::iterator p = quorum_names.begin(); p != quorum_names.end(); ++p) f->dump_string("mon", *p); f->close_section(); // quorum_names @@ -1975,7 +1975,7 @@ void Monitor::get_status(stringstream &ss, Formatter *f) ss << " cluster " << monmap->get_fsid() << "\n"; ss << " health " << health << "\n"; ss << " monmap " << *monmap << ", election epoch " << get_epoch() - << ", quorum " << get_quorum() << " " << get_quorum_names() << "\n"; + << ", quorum " << get_quorum() << " " << get_quorum_names() << "\n"; if (mdsmon()->mdsmap.get_epoch() > 1) ss << " mdsmap " << mdsmon()->mdsmap << "\n"; osdmon()->osdmap.print_summary(NULL, ss); diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h index 30f117d90886e..e8828a1646448 100644 --- a/src/mon/Monitor.h +++ b/src/mon/Monitor.h @@ -516,10 +516,10 @@ public: epoch_t get_epoch(); int get_leader() { return leader; } const set& get_quorum() { return quorum; } - set get_quorum_names() { - set q; + list get_quorum_names() { + list q; for (set::iterator p = quorum.begin(); p != quorum.end(); ++p) - q.insert(monmap->get_name(*p)); + q.push_back(monmap->get_name(*p)); return q; } uint64_t get_quorum_features() const { -- 2.39.5