mon: tolerate won election while active

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index c1ac477c9bbda5f07bce4b8c90651fefd6e180b0..2f62755838d6450f88fbfc3acc6349aae3b0ac3f 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -595,6 +595,9 @@ epoch_t Monitor::get_epoch()
 
 void Monitor::win_election(epoch_t epoch, set<int>& active) 
 {
+  if (!is_electing())
+    reset();
+
   state = STATE_LEADER;
   leader_since = ceph_clock_now(g_ceph_context);
   leader = rank;