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>
(cherry picked from commit 392a8e21f8571b410c85be2129ef62dd6fc52b54)

diff --git a/src/mon/PaxosService.h b/src/mon/PaxosService.h
index 5398f20802174c5202dfbb45c6cc61ae290ffba1..63e06110d073c1a43868f4480a977764b323ccd9 100644 (file)
--- 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());
   }
 
   /**