diff options
author | Greg Farnum <greg@inktank.com> | 2013-04-30 11:01:54 -0700 |
---|---|---|
committer | Greg Farnum <greg@inktank.com> | 2013-04-30 11:01:54 -0700 |
commit | 6ae9bbb5d03cb5695a4ebb7a3c20f729de1bd67a (patch) | |
tree | ab01df0a90246c39044b2d9144aa156f3e0f0233 | |
parent | 53a2c64ff1807c8d863dcd8c05571f4b3ed9c608 (diff) | |
download | ceph-6ae9bbb5d03cb5695a4ebb7a3c20f729de1bd67a.tar.gz |
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>
-rw-r--r-- | src/mon/Elector.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mon/Elector.cc b/src/mon/Elector.cc index eed2d40e901..b6f047e20d2 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; |