From: Sage Weil <sage@inktank.com>
Date: Fri, 31 May 2013 23:45:08 +0000 (-0700)
Subject: mon: simplify Monitor::init_paxos()
X-Git-Tag: v0.66~47^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e832e76a4af04b091c806ad412bcfd0326d75a2d;p=ceph.git

mon: simplify Monitor::init_paxos()

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 2c655dea508..b74e821b780 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();
     }
   }