From: Sage Weil <sage@inktank.com>
Date: Tue, 19 Mar 2013 17:15:41 +0000 (-0700)
Subject: mon/Paxos: set state to RECOVERING during restart
X-Git-Tag: v0.59~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=efc4b1268ed0c5222df183db4a3a6dcf02df1026;p=ceph.git

mon/Paxos: set state to RECOVERING during restart

This ensures that the paxos state is not active when the PaxosService
restart() methods run right afterwards, and that EAGAIN waiters will get
requeued appropriately.

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/mon/Paxos.cc b/src/mon/Paxos.cc
index 1a21ff37b17..41214a0335d 100644
--- a/src/mon/Paxos.cc
+++ b/src/mon/Paxos.cc
@@ -1125,6 +1125,7 @@ void Paxos::restart()
   if (!proposals.empty())
     proposals.clear();
 
+  state = STATE_RECOVERING;
   going_to_bootstrap = false;
 
   finish_contexts(g_ceph_context, waiting_for_commit, -EAGAIN);