From: songbaisen <song.baisen@zte.com.cn>
Date: Mon, 20 Jun 2016 11:00:44 +0000 (+0800)
Subject:   mon: remove the repeat quorum size jugement
X-Git-Tag: v11.0.0~109^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=10bf6a5927d93bd9088cc2cf57719f3732700f63;p=ceph.git

  mon: remove the repeat quorum size jugement

  Signed-off-by:song baisen <song.baisen@zte.com.cn>
---

diff --git a/src/mon/Paxos.cc b/src/mon/Paxos.cc
index be44f3479c1d9..c294fb26d1ce6 100644
--- a/src/mon/Paxos.cc
+++ b/src/mon/Paxos.cc
@@ -1424,9 +1424,7 @@ bool Paxos::is_readable(version_t v)
     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
+      last_committed > 0 && is_lease_valid(); // must have a value alone, or have lease
   dout(5) << __func__ << " = " << (int)ret
 	  << " - now=" << ceph_clock_now(g_ceph_context)
 	  << " lease_expire=" << lease_expire