elector: don't clear peer_info in bump_epoch()

Not sure how I got that wrong, but we bump_epoch() on
winning an election, right before we start looking through
peer_info. So just do it on election start instead.

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

diff --git a/src/mon/Elector.cc b/src/mon/Elector.cc
index beb2884b55a4fd11bdfd17d8298201ca2e5f4540..07702c20cc5e0763d03eaf71b97449e3a88f5005 100644 (file)
--- a/src/mon/Elector.cc
+++ b/src/mon/Elector.cc
@@ -92,7 +92,6 @@ void Elector::shutdown()
 
 void Elector::notify_bump_epoch()
 {
-  peer_info.clear();
   mon->join_election();
 }
 
@@ -168,7 +167,6 @@ void Elector::cancel_timer()
 
 void Elector::message_victory(const set<int>& quorum)
 {
-
   uint64_t cluster_features = CEPH_FEATURES_ALL;
   mon_feature_t mon_features = ceph::features::mon::get_supported();
   map<int,Metadata> metadata;