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.61~33
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6ae9bbb5d03cb5695a4ebb7a3c20f729de1bd67a;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>
---

diff --git a/src/mon/Elector.cc b/src/mon/Elector.cc
index eed2d40e9017..b6f047e20d25 100644
--- a/src/mon/Elector.cc
+++ b/src/mon/Elector.cc
@@ -55,6 +55,7 @@ void Elector::bump_epoch(epoch_t e)
   MonitorDBStore::Transaction t;
   t.put(Monitor::MONITOR_NAME, "election_epoch", epoch);
   mon->store->apply_transaction(t);
+  mon->reset();
 
   // clear up some state
   electing_me = false;