From 59ccf9cea823c312c53aa2d15aa8e4cba9a29f43 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 17 May 2012 15:38:45 -0700 Subject: [PATCH] mon: clean up initial_members code slightly Don't recalc rank unless we need to. Signed-off-by: Sage Weil --- src/mon/Monitor.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index d8134d07eb0d8..d156c67af6e41 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -286,6 +286,7 @@ int Monitor::init() // impose initial quorum restrictions? list initial_members; get_str_list(g_conf->mon_initial_members, initial_members); + if (initial_members.size()) { dout(1) << " initial_members " << initial_members << ", filtering seed monmap" << dendl; @@ -321,13 +322,13 @@ int Monitor::init() } } + // (re)calc my rank, in case it changed + rank = monmap->get_rank(name); + messenger->set_myname(entity_name_t::MON(rank)); + messenger->mark_down_all(); + dout(10) << " monmap is " << *monmap << dendl; } - - // (re)calc my rank, in case it changed - rank = monmap->get_rank(name); - messenger->set_myname(entity_name_t::MON(rank)); - messenger->mark_down_all(); } // init paxos -- 2.39.5