From 02b0b4a9acb439b2ee5deadc8b02492006492931 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 7 Jun 2013 11:41:21 -0700 Subject: [PATCH] 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 (cherry picked from commit 392a8e21f8571b410c85be2129ef62dd6fc52b54) --- src/mon/PaxosService.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mon/PaxosService.h b/src/mon/PaxosService.h index 5398f20802174..63e06110d073c 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()); } /** -- 2.39.5