From: Greg Farnum <gfarnum@redhat.com>
Date: Thu, 20 Jun 2019 00:00:45 +0000 (-0700)
Subject: elector: don't clear peer_info in bump_epoch()
X-Git-Tag: v15.1.0~1791^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1261c44ca7621b3d4804bd6255c40a95b5814cc2;p=ceph.git

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 beb2884b55a4..07702c20cc5e 100644
--- 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;