From: songbaisen <song.baisen@zte.com.cn>
Date: Wed, 6 Jul 2016 08:18:41 +0000 (+0800)
Subject: mon: avoid start election twice when quorum enter
X-Git-Tag: v12.0.1~484^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=36cc8c483c2feed80eff1f2e9719ccce4f4fc1f2;p=ceph.git

mon: avoid start election twice when quorum enter

when quorum enter it is no meaning to start election twice

Signed-off-by: song baisen <song.baisen@zte.com.cn>
---

diff --git a/src/mon/Elector.cc b/src/mon/Elector.cc
index 99049a3e931..c388a478a4e 100644
--- a/src/mon/Elector.cc
+++ b/src/mon/Elector.cc
@@ -488,6 +488,5 @@ void Elector::start_participating()
 {
   if (!participating) {
     participating = true;
-    call_election();
   }
 }
diff --git a/src/mon/Elector.h b/src/mon/Elector.h
index 1c2157eb331..b9036c405a4 100644
--- a/src/mon/Elector.h
+++ b/src/mon/Elector.h
@@ -425,6 +425,7 @@ class Elector {
    * @post  @p participating is true
    */
   void start_participating();
+
   /**
    * @}
    */