From: Sage Weil <sage@newdream.net>
Date: Fri, 11 Nov 2011 05:58:53 +0000 (-0800)
Subject: mon: elector: always start election via monitor
X-Git-Tag: v0.39~43
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6bc9a544b62bb21f6ee7ef51bfbe9111f7add9cb;p=ceph-ci.git

mon: elector: always start election via monitor

Don't go from active -> electing without passing (monitor) go.

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

diff --git a/src/mon/Elector.cc b/src/mon/Elector.cc
index c1c7cc23422..928e7f2e2f0 100644
--- a/src/mon/Elector.cc
+++ b/src/mon/Elector.cc
@@ -195,8 +195,10 @@ void Elector::handle_propose(MMonElection *m)
       dout(5) << "no, we already acked " << leader_acked << dendl;
     } else {
       // wait, i should win!
-      if (!electing_me)
-	start();
+      if (!electing_me) {
+	mon->reset();
+	mon->start_election();
+      }
     }
   } else {
     // they would win over me