From: Sage Weil <sage@newdream.net>
Date: Thu, 25 Jun 2009 21:58:46 +0000 (-0700)
Subject: mon: remove old asserts conflicting with new readable semantics
X-Git-Tag: v0.10~134
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=52046d70145fc43e74faabc32619afbf02ae4bfd;p=ceph.git

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 cabda447f017..e092055498a9 100644
--- 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 676e4a09b5c9..d0210d35ceaa 100644
--- 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 05f59c8ca492..a9cc7dffbc0a 100644
--- 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 7e3d5a51ff49..22f15d5ffe8a 100644
--- 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 5a1941b48a89..b7e03b9bfd0c 100644
--- 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);