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 fa858b734c689339690a79c5ed6e91440b398810..04531d10916bc788dce746624b58b8fc88f9d2ba 100644 (file)
--- 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 b6cf46d36524b8bbfb6bf13158b1d033428aab52..7779360ca33e2ae9290a17071a2d3ea42406ff55 100644 (file)
--- 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());
 }
 
 // ---------------------------------