mon: read() needn't check is_readable()

diff --git a/src/mon/ClientMonitor.cc b/src/mon/ClientMonitor.cc
index 03735d643665e6ef63521709f2339e6d80b13d0f..83b5d4783533312d3ef6f0845636637fc2792806 100644 (file)
--- a/src/mon/ClientMonitor.cc
+++ b/src/mon/ClientMonitor.cc
@@ -63,21 +63,17 @@ bool ClientMonitor::update_from_paxos()
   while (paxosv > client_map.version) {
     bufferlist bl;
     bool success = paxos->read(client_map.version+1, bl);
-    if (success) {
-      dout(7) << "update_from_paxos  applying incremental " << client_map.version+1 << dendl;
-      Incremental inc;
-      bufferlist::iterator p = bl.begin();
-      inc.decode(p);
-      client_map.apply_incremental(inc);
-
-      dout(1) << client_map.client_addr.size() << " clients (+" 
-             << inc.mount.size() << " -" << inc.unmount.size() << ")" 
-             << dendl;
-      
-    } else {
-      dout(7) << "update_from_paxos  couldn't read incremental " << client_map.version+1 << dendl;
-      return false;
-    }
+    assert(success);
+
+    dout(7) << "update_from_paxos  applying incremental " << client_map.version+1 << dendl;
+    Incremental inc;
+    bufferlist::iterator p = bl.begin();
+    inc.decode(p);
+    client_map.apply_incremental(inc);
+    
+    dout(1) << client_map.client_addr.size() << " clients (+" 
+           << inc.mount.size() << " -" << inc.unmount.size() << ")" 
+           << dendl;
   }
 
   // save latest

diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index 8a0fc4ebc74a9c42b1ca1488642fa3fab86ef341..8ed2f82a305adb8557579aaa49e6c60cfa7a6e53 100644 (file)
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -128,18 +128,15 @@ bool PGMonitor::update_from_paxos()
   while (paxosv > pg_map.version) {
     bufferlist bl;
     bool success = paxos->read(pg_map.version+1, bl);
-    if (success) {
-      dout(7) << "update_from_paxos  applying incremental " << pg_map.version+1 << dendl;
-      PGMap::Incremental inc;
-      bufferlist::iterator p = bl.begin();
-      inc.decode(p);
-      pg_map.apply_incremental(inc);
-      
-      dout(0) << *this << dendl;
-    } else {
-      dout(7) << "update_from_paxos  couldn't read incremental " << pg_map.version+1 << dendl;
-      return false;
-    }
+    assert(success);
+
+    dout(7) << "update_from_paxos  applying incremental " << pg_map.version+1 << dendl;
+    PGMap::Incremental inc;
+    bufferlist::iterator p = bl.begin();
+    inc.decode(p);
+    pg_map.apply_incremental(inc);
+    
+    dout(0) << *this << dendl;
   }
 
   // save latest

diff --git a/src/mon/Paxos.cc b/src/mon/Paxos.cc
index b4a62f5e50c14e199f0c2f600b83430ba7a7de9b..2c751ec27a89f40b80fa98715bda7201697106e4 100644 (file)
--- a/src/mon/Paxos.cc
+++ b/src/mon/Paxos.cc
@@ -779,9 +779,6 @@ bool Paxos::is_readable()
 
 bool Paxos::read(version_t v, bufferlist &bl)
 {
-  if (!is_readable()) 
-    return false;
-
   if (!mon->store->get_bl_sn(bl, machine_name, v))
     return false;
   return true;
@@ -789,8 +786,6 @@ bool Paxos::read(version_t v, bufferlist &bl)
 
 version_t Paxos::read_current(bufferlist &bl)
 {
-  if (!is_readable()) 
-    return 0;
   if (read(last_committed, bl))
     return last_committed;
   return 0;