diff options
| author | Sage Weil <sage@inktank.com> | 2013-06-07 11:41:21 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-06-24 16:16:42 -0700 |
| commit | 02b0b4a9acb439b2ee5deadc8b02492006492931 (patch) | |
| tree | b6a0d0d8f0842bac51df61ac07ee07c3d3ea51cf | |
| parent | c6d5dc4d47838c8c8f4d059b7d018dea3f9c4425 (diff) | |
| download | ceph-02b0b4a9acb439b2ee5deadc8b02492006492931.tar.gz | |
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)
| -rw-r--r-- | src/mon/PaxosService.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mon/PaxosService.h b/src/mon/PaxosService.h index 5398f208021..63e06110d07 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()); } /** |