From 4e40142bd2e6c00b15f7e20d0a7a97e78f8644c2 Mon Sep 17 00:00:00 2001 From: Joao Eduardo Luis Date: Tue, 30 Apr 2013 18:45:22 +0100 Subject: 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 --- src/mon/Monitor.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index 077c9e99bd1..815eefc568f 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -1930,10 +1930,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; -- cgit v1.2.1