From: Joao Eduardo Luis Date: Tue, 30 Apr 2013 17:45:22 +0000 (+0100) Subject: mon: Monitor: disregard paxos_max_join_drift when deciding whether to sync X-Git-Tag: v0.61~29^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a97eccadf75cd390ae84ed13d679d67720fda37b;p=ceph.git 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 --- diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index 431cb5d239d7..e739ff1cdf86 100644 --- 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;