From: Greg Farnum <greg@inktank.com>
Date: Tue, 30 Apr 2013 18:01:54 +0000 (-0700)
Subject: elector: trigger a mon reset whenever we bump the epoch
X-Git-Tag: v0.56.5~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ea9c76b8f457d44e63551d47b6dd30bd16a56468;p=ceph.git

elector: trigger a mon reset whenever we bump the epoch

We need to call reset during every election cycle; luckily we
can call it more than once. bump_epoch is (by definition!) only called
once per cycle, and it's called at the beginning, so we put it there.

Fixes #4858.

Signed-off-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
(cherry picked from commit 6ae9bbb5d03cb5695a4ebb7a3c20f729de1bd67a)

Conflicts:

	src/mon/Elector.cc
---

diff --git a/src/mon/Elector.cc b/src/mon/Elector.cc
index 199eaeae5384..599f68886018 100644
--- a/src/mon/Elector.cc
+++ b/src/mon/Elector.cc
@@ -53,6 +53,7 @@ void Elector::bump_epoch(epoch_t e)
   assert(epoch <= e);
   epoch = e;
   mon->store->put_int(epoch, "election_epoch");
+  mon->reset();
 
   // clear up some state
   electing_me = false;