mon: remove old asserts conflicting with new readable semantics

We may now call update_from_paxos while updating OR active.

diff --git a/src/mon/ClassMonitor.cc b/src/mon/ClassMonitor.cc
index cabda447f017c64df98fa7a15c4b6170a897b70c..e092055498a975751ed8f8e1d958211a17759e0c 100644 (file)
--- a/src/mon/ClassMonitor.cc
+++ b/src/mon/ClassMonitor.cc
@@ -95,12 +95,9 @@ bool ClassMonitor::store_impl(ClassInfo& info, ClassImpl& impl)
 bool ClassMonitor::update_from_paxos()
 {
   version_t paxosv = paxos->get_version();
-
   if (paxosv == list.version) return true;
   assert(paxosv >= list.version);
 
-  dout(0) << "ClassMonitor::update_from_paxos() paxosv=" << paxosv << " list.version=" << list.version << dendl;
-
   bufferlist blog;
 
   if (list.version == 0 && paxosv > 1) {

diff --git a/src/mon/ClientMonitor.cc b/src/mon/ClientMonitor.cc
index 676e4a09b5c96b6356eed516ab8ebb7bf898cced..d0210d35ceaacd232123273b6643e01318e432e9 100644 (file)
--- a/src/mon/ClientMonitor.cc
+++ b/src/mon/ClientMonitor.cc
@@ -46,8 +46,6 @@ static ostream& _prefix(Monitor *mon, ClientMap& client_map) {
 
 bool ClientMonitor::update_from_paxos()
 {
-  assert(paxos->is_active());
-  
   version_t paxosv = paxos->get_version();
   if (paxosv == client_map.version) return true;
   assert(paxosv >= client_map.version);

diff --git a/src/mon/LogMonitor.cc b/src/mon/LogMonitor.cc
index 05f59c8ca4922d0736790ed27b0375a046a7ed3d..a9cc7dffbc0a167902c495c11babd895e205ceeb 100644 (file)
--- a/src/mon/LogMonitor.cc
+++ b/src/mon/LogMonitor.cc
@@ -92,7 +92,6 @@ void LogMonitor::create_initial(bufferlist& bl)
 bool LogMonitor::update_from_paxos()
 {
   version_t paxosv = paxos->get_version();
-
   if (paxosv == summary.version) return true;
   assert(paxosv >= summary.version);
 

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index 7e3d5a51ff491e086b3fd63e17230717660b4208..22f15d5ffe8a4498c285b45ca5a906d03fbbf2a9 100644 (file)
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -71,8 +71,6 @@ void MDSMonitor::create_initial(bufferlist& bl)
 
 bool MDSMonitor::update_from_paxos()
 {
-  assert(paxos->is_active());
-
   version_t paxosv = paxos->get_version();
   if (paxosv == mdsmap.epoch) return true;
   assert(paxosv >= mdsmap.epoch);

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 5a1941b48a89a735c873b741f27a899724c56b5f..b7e03b9bfd0c447ae8c0bf75155cc8856502f83c 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -125,8 +125,6 @@ void OSDMonitor::create_initial(bufferlist& bl)
 
 bool OSDMonitor::update_from_paxos()
 {
-  assert(paxos->is_active());
-
   version_t paxosv = paxos->get_version();
   if (paxosv == osdmap.epoch) return true;
   assert(paxosv >= osdmap.epoch);