From: Greg Farnum <gfarnum@redhat.com>
Date: Mon, 24 Jun 2019 18:11:36 +0000 (-0700)
Subject: elector: persist the epoch in bump_epoch()
X-Git-Tag: v15.1.0~1791^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b8f04c5e763bb85596f9d29077a7f16f818b216b;p=ceph.git

elector: persist the epoch in bump_epoch()

I somehow broke this when initially hoisting it out of Elector. Whoops!

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

diff --git a/src/mon/ElectionLogic.cc b/src/mon/ElectionLogic.cc
index 0d456ba713e..1c4c01d4e9c 100644
--- a/src/mon/ElectionLogic.cc
+++ b/src/mon/ElectionLogic.cc
@@ -45,7 +45,7 @@ void ElectionLogic::bump_epoch(epoch_t e)
   ldout(cct, 10) << __func__ << epoch << " to " << e << dendl;
   ceph_assert(epoch <= e);
   epoch = e;
-  elector->validate_store();
+  elector->persist_epoch(epoch);
   // clear up some state
   electing_me = false;
   acked_me.clear();