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 c1c7cc2342206f6470403c9952f77d8623ebae0c..928e7f2e2f093f029539d1ab7a648e8c289cdec2 100644 (file)
--- 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