mon: Monitor: disregard paxos_max_join_drift when deciding whether to sync

We should only rely on whether our paxos version is overlap with whatever
they have -- we'll catch up later with them.

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 431cb5d239d7962dca57ca0b1a12c5600738df52..e739ff1cdf860e1f7cd157474174ba81fc9a991f 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -1936,10 +1936,9 @@ void Monitor::handle_probe_reply(MMonProbe *m)
   if (m->quorum.size()) {
     dout(10) << " existing quorum " << m->quorum << dendl;
 
-    if ((paxos->get_version() + g_conf->paxos_max_join_drift <
-       m->paxos_last_version) ||
-       (paxos->get_version() < m->paxos_first_version)){
-      dout(10) << " peer paxos version " << m->paxos_last_version
+    if (paxos->get_version() < m->paxos_first_version) {
+      dout(10) << " peer paxos versions [" << m->paxos_first_version
+               << "," << m->paxos_last_version << "]"
               << " vs my version " << paxos->get_version()
               << " (too far ahead)"
               << dendl;