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 199eaeae5384a3af705a1b2319c5730780ab48a5..599f68886018b6c2b27ba5ca5ffa839ed27f4a8d 100644 (file)
--- 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;