From: Sage Weil <sage@inktank.com>
Date: Fri, 5 Jul 2013 19:11:17 +0000 (-0700)
Subject: mon/Paxos: move consistent check into Paxos::init()
X-Git-Tag: v0.67-rc1~126^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=af3b49f6063489750d2f84075df368bc987254f2;p=ceph.git

mon/Paxos: move consistent check into Paxos::init()

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

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index fa858b734c68..04531d10916b 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -519,10 +519,7 @@ void Monitor::init_paxos()
     paxos_service[i]->init();
   }
 
-  // update paxos
-  if (paxos->is_consistent()) {
-    refresh_from_paxos(NULL);
-  }
+  refresh_from_paxos(NULL);
 }
 
 void Monitor::refresh_from_paxos(bool *need_bootstrap)
diff --git a/src/mon/Paxos.cc b/src/mon/Paxos.cc
index b6cf46d36524..7779360ca33e 100644
--- a/src/mon/Paxos.cc
+++ b/src/mon/Paxos.cc
@@ -70,6 +70,7 @@ void Paxos::init()
 	   << " first_committed: " << first_committed << dendl;
 
   dout(10) << "init" << dendl;
+  assert(is_consistent());
 }
 
 // ---------------------------------