From f1a98fb8af197ddb352c151533bc0df9b7aaf6aa Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Fri, 11 Nov 2011 12:22:37 -0800
Subject: [PATCH] mon: tolerate won election while active

Signed-off-by: Sage Weil <sage@newdream.net>
---
 src/mon/Monitor.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index c1ac477c9bbda..2f62755838d64 100644
--- 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;
-- 
2.39.5