From: Sage Weil <sage@redhat.com>
Date: Mon, 8 Sep 2014 15:39:50 +0000 (-0700)
Subject: mon/Paxos: make is_readable debug output show result
X-Git-Tag: v0.86~129^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2421%2Fhead;p=ceph.git

mon/Paxos: make is_readable debug output show result

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mon/Paxos.cc b/src/mon/Paxos.cc
index 04644917c61..ef745ff088f 100644
--- a/src/mon/Paxos.cc
+++ b/src/mon/Paxos.cc
@@ -1424,17 +1424,22 @@ void Paxos::dispatch(PaxosServiceMessage *m)
 
 bool Paxos::is_readable(version_t v)
 {
-  dout(5) << "is_readable now=" << ceph_clock_now(g_ceph_context)
-	  << " lease_expire=" << lease_expire
-	  << " has v" << v << " lc " << last_committed << dendl;
+  bool ret;
   if (v > last_committed)
-    return false;
-  return 
-    (mon->is_peon() || mon->is_leader()) &&
-    (is_active() || is_updating() || is_writing()) &&
-    last_committed > 0 &&           // must have a value
-    (mon->get_quorum().size() == 1 ||  // alone, or
-     is_lease_valid()); // have lease
+    ret = false;
+  else
+    ret =
+      (mon->is_peon() || mon->is_leader()) &&
+      (is_active() || is_updating() || is_writing()) &&
+      last_committed > 0 &&           // must have a value
+      (mon->get_quorum().size() == 1 ||  // alone, or
+       is_lease_valid()); // have lease
+  dout(5) << __func__ << " = " << (int)ret
+	  << " - now=" << ceph_clock_now(g_ceph_context)
+	  << " lease_expire=" << lease_expire
+	  << " has v" << v << " lc " << last_committed
+	  << dendl;
+  return ret;
 }
 
 bool Paxos::read(version_t v, bufferlist &bl)