From: Sage Weil <sage@inktank.com>
Date: Fri, 7 Jun 2013 18:41:21 +0000 (-0700)
Subject: mon/PaxosService: not active during paxos UPDATING_PREVIOUS
X-Git-Tag: v0.66~47^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=392a8e21f8571b410c85be2129ef62dd6fc52b54;p=ceph.git

mon/PaxosService: not active during paxos UPDATING_PREVIOUS

Treat this as an extension of the recovery process, e.g.

 RECOVERING -> ACTIVE
or
 RECOVERING -> UPDATING_PREVIOUS -> ACTIVE

and we are not active until we get to "the end" in both cases.

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

diff --git a/src/mon/PaxosService.h b/src/mon/PaxosService.h
index 600c7082054..73a7bb56efa 100644
--- a/src/mon/PaxosService.h
+++ b/src/mon/PaxosService.h
@@ -518,7 +518,7 @@ public:
   bool is_active() {
     return
       !is_proposing() &&
-      (paxos->is_active() || paxos->is_updating() || paxos->is_updating_previous());
+      (paxos->is_active() || paxos->is_updating());
   }
 
   /**