]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: simplify Monitor::init_paxos()
authorSage Weil <sage@inktank.com>
Fri, 31 May 2013 23:45:08 +0000 (16:45 -0700)
committerSage Weil <sage@inktank.com>
Mon, 24 Jun 2013 23:16:41 +0000 (16:16 -0700)
Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit e832e76a4af04b091c806ad412bcfd0326d75a2d)

src/mon/Monitor.cc

index 484ccf962aab977fd6685db7a3a0425123128d92..0da19456aaab16050f0c216d57c14c7a4963cf52 100644 (file)
@@ -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();
     }
   }