summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-05-31 16:45:08 -0700
committerSage Weil <sage@inktank.com>2013-06-17 14:24:44 -0700
commitecf5b510fdec0fcc760f847b294f855845ba7962 (patch)
tree08bf1cde5c29f55020458688d6801ba284b07267
parentaabbe5e0e15e31fdd98586193564cc7a4efd49ed (diff)
downloadceph-ecf5b510fdec0fcc760f847b294f855845ba7962.tar.gz
mon: simplify Monitor::init_paxos()
Signed-off-by: Sage Weil <sage@inktank.com>
-rw-r--r--src/mon/Monitor.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 6eab53a5a57..b310d81a7e6 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -521,12 +521,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();
}
}