From: Sage Weil <sage@inktank.com>
Date: Fri, 12 Jul 2013 20:50:49 +0000 (-0700)
Subject: mon/PaxosService: do not prepare new pending if still proposing
X-Git-Tag: v0.67-rc1~74^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d4876c533ccdddddba8d5097e8e19e4ff079da1b;p=ceph.git

mon/PaxosService: do not prepare new pending if still proposing

The _active callback can get called while are already proposing.  If
that happens, we should not prepare a fresh new pending but should
wait for the previous proposal to finish.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
---

diff --git a/src/mon/PaxosService.cc b/src/mon/PaxosService.cc
index e20322a4a6b5..efe60aafd691 100644
--- a/src/mon/PaxosService.cc
+++ b/src/mon/PaxosService.cc
@@ -259,6 +259,10 @@ void PaxosService::election_finished()
 
 void PaxosService::_active()
 {
+  if (is_proposing()) {
+    dout(10) << "_acting - proposing" << dendl;
+    return;
+  }
   if (!is_active()) {
     dout(10) << "_active - not active" << dendl;
     wait_for_active(new C_Active(this));