osdc: refactor use of _is_readable

Limit calls to _is_readable to places where the
readableness can actually have changed (on assimilate_prefetch
where it can go true, and in try_read_entry where it
can go false).  Elsewhere, return a cached
result (Journaler::readable).

Signed-off-by: John Spray <john.spray@redhat.com>

diff --git a/src/osdc/Journaler.cc b/src/osdc/Journaler.cc
index 148817578b082e4c014587283498a9849c56d3c3..a723c164d74bbe7907dc657803dcc39e4dcb8ceb 100644 (file)
--- a/src/osdc/Journaler.cc
+++ b/src/osdc/Journaler.cc
@@ -834,11 +834,8 @@ void Journaler::_finish_read(int r, uint64_t offset, bufferlist& bl)
 
   try {
     _assimilate_prefetch();
-    // Check the readable-ness of the buffer: do this head because it involves
-    // decoding, and we would like to catch any decode errors here so that
-    // external is_readable() callers don't have to.
-    _is_readable();
   } catch (const buffer::error &err) {
+    lderr(cct) << "_decode error from assimilate_prefetch" << dendl;
     error = -EINVAL;
     if (on_readable) {
       C_OnFinisher *f = on_readable;
@@ -852,7 +849,7 @@ void Journaler::_finish_read(int r, uint64_t offset, bufferlist& bl)
 
 void Journaler::_assimilate_prefetch()
 {
-  bool was_readable = _is_readable();
+  bool was_readable = readable;
 
   bool got_any = false;
   while (!prefetch_buf.empty()) {
@@ -872,13 +869,17 @@ void Journaler::_assimilate_prefetch()
     got_any = true;
   }
 
-  if (got_any)
+  if (got_any) {
     ldout(cct, 10) << "_assimilate_prefetch read_buf now " << read_pos << "~" << read_buf.length() 
             << ", read pointers " << read_pos << "/" << received_pos << "/" << requested_pos
             << dendl;
 
-  if ((got_any && !was_readable && _is_readable()) ||
-      read_pos == write_pos) {
+    // Update readability (this will also hit any decode errors resulting
+    // from bad data)
+    readable = _is_readable();
+  }
+
+  if ((got_any && !was_readable && readable) || read_pos == write_pos) {
     // readable!
     ldout(cct, 10) << "_finish_read now readable (or at journal end)" << dendl;
     if (on_readable) {
@@ -980,12 +981,6 @@ bool Journaler::_is_readable()
   if (read_pos == write_pos)
     return false;
 
-  // Are we errored?  Stop here to avoid risking
-  // raising decode errors.
-  if (error != 0) {
-    return false;
-  }
-
   // Check if the retrieve bytestream has enough for an entry
   uint64_t need;
   if (journal_stream.readable(read_buf, &need)) {
@@ -1028,7 +1023,11 @@ bool Journaler::is_readable()
 {
   Mutex::Locker l(lock);
 
-  bool r = _is_readable();
+  if (error != 0) {
+    return false;
+  }
+
+  bool r = readable;
   _prefetch();
   return r;
 }
@@ -1078,13 +1077,13 @@ void Journaler::_finish_erase(int data_result, C_OnFinisher *completion)
 
 /* try_read_entry(bl)
  *  read entry into bl if it's ready.
- *  otherwise, do nothing.  (well, we'll start fetching it for good measure.)
+ *  otherwise, do nothing.
  */
 bool Journaler::try_read_entry(bufferlist& bl)
 {
   Mutex::Locker l(lock);
 
-  if (!_is_readable()) {  // this may start a read.
+  if (!readable) {
     ldout(cct, 10) << "try_read_entry at " << read_pos << " not readable" << dendl;
     return false;
   }
@@ -1097,6 +1096,7 @@ bool Journaler::try_read_entry(bufferlist& bl)
       assert(start_ptr == read_pos);
     }
   } catch (const buffer::error &e) {
+    lderr(cct) << __func__ << ": decode error from journal_stream" << dendl;
     error = -EINVAL;
     return false;
   }
@@ -1105,6 +1105,14 @@ bool Journaler::try_read_entry(bufferlist& bl)
           << read_pos << "~" << consumed << " (have " << read_buf.length() << ")" << dendl;
 
   read_pos += consumed;
+  try {
+    // We were readable, we might not be any more
+    readable = _is_readable();
+  } catch (const buffer::error &e) {
+    lderr(cct) << __func__ << ": decode error from _is_readable" << dendl;
+    error = -EINVAL;
+    return false;
+  }
 
   // prefetch?
   _prefetch();
@@ -1116,7 +1124,7 @@ void Journaler::wait_for_readable(Context *onreadable)
   Mutex::Locker l(lock);
 
   assert(on_readable == 0);
-  if (!_is_readable()) {
+  if (!readable) {
     ldout(cct, 10) << "wait_for_readable at " << read_pos << " onreadable " << onreadable << dendl;
     on_readable = wrap_finisher(onreadable);
   } else {

diff --git a/src/osdc/Journaler.h b/src/osdc/Journaler.h
index d7ae92d6d5e876dbb66c1d8be7920474d0567a27..fead2af5d040a6b655f3391c828142f58e15bfe8 100644 (file)
--- a/src/osdc/Journaler.h
+++ b/src/osdc/Journaler.h
@@ -336,6 +336,8 @@ private:
   uint64_t trimming_pos;      // what we've requested to trim through
   uint64_t trimmed_pos;   // what has been trimmed
 
+  bool readable;
+
   void _finish_trim(int r, uint64_t to);
   class C_Trim;
   friend class C_Trim;
@@ -385,7 +387,7 @@ public:
     read_pos(0), requested_pos(0), received_pos(0),
     fetch_len(0), temp_fetch_len(0),
     on_readable(0), on_write_error(NULL), called_write_error(false),
-    expire_pos(0), trimming_pos(0), trimmed_pos(0)
+    expire_pos(0), trimming_pos(0), trimmed_pos(0), readable(false)
   {
     memset(&layout, 0, sizeof(layout));
   }