diff options
| author | Sage Weil <sage@inktank.com> | 2013-06-07 11:41:21 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-06-17 14:24:45 -0700 |
| commit | b8bf8985ed3cd033ffd6c67d353e5f703c9fb520 (patch) | |
| tree | 2103875cc96c5e6a394739f6d1486b8adb30f674 | |
| parent | 3b50d7f96d0b3fbfd9407341d8a7b9e404461283 (diff) | |
| download | ceph-b8bf8985ed3cd033ffd6c67d353e5f703c9fb520.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>
| -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 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()); } /** |