From: Greg Farnum <gfarnum@redhat.com>
Date: Wed, 12 Jun 2019 23:46:49 +0000 (-0700)
Subject: elector: route _bump_epoch through the interface-to-be
X-Git-Tag: v15.1.0~1791^2~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b7a44c0a7755a8e482aadd27061ed815af4d30b7;p=ceph.git

elector: route _bump_epoch through the interface-to-be

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

diff --git a/src/mon/Elector.cc b/src/mon/Elector.cc
index 39645268c4a4..626c6d33099a 100644
--- a/src/mon/Elector.cc
+++ b/src/mon/Elector.cc
@@ -117,6 +117,11 @@ void ElectionLogic::bump_epoch(epoch_t e)
   // clear up some state
   electing_me = false;
   acked_me.clear();
+  elector_bump_epoch();
+}
+
+void ElectionLogic::elector_bump_epoch()
+{
   elector->_bump_epoch();
 }
 
diff --git a/src/mon/Elector.h b/src/mon/Elector.h
index 6cb2e4ec25a4..c599dd7733fa 100644
--- a/src/mon/Elector.h
+++ b/src/mon/Elector.h
@@ -54,6 +54,7 @@ private:
   void persist_epoch(epoch_t e);
   epoch_t read_persisted_epoch();
   void validate_store();
+  void elector_bump_epoch();
   bool elector_is_current_member(int rank);
   void elector_trigger_new_election();
   int elector_my_rank();