diff options
| author | Sage Weil <sage@inktank.com> | 2013-05-31 16:45:08 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-06-24 16:16:41 -0700 |
| commit | 57c89291a48c319907fb3029746d9f5a4bd9dd61 (patch) | |
| tree | 06666e02046edc6c6c5aa25653e234c78f5398fb | |
| parent | fd1769cb2d61e8f2c7921a78760e8f12b28258fb (diff) | |
| download | ceph-57c89291a48c319907fb3029746d9f5a4bd9dd61.tar.gz | |
mon: simplify Monitor::init_paxos()
Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit e832e76a4af04b091c806ad412bcfd0326d75a2d)
| -rw-r--r-- | src/mon/Monitor.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index 484ccf962aa..0da19456aaa 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -515,12 +515,11 @@ void Monitor::init_paxos() paxos->init(); // update paxos - if (paxos->is_consistent()) + if (paxos->is_consistent()) { refresh_from_paxos(NULL); - // init services - for (int i = 0; i < PAXOS_NUM; ++i) { - if (paxos->is_consistent()) { + // init services + for (int i = 0; i < PAXOS_NUM; ++i) { paxos_service[i]->init(); } } |