diff options
| author | Joao Eduardo Luis <joao.luis@inktank.com> | 2013-04-30 18:45:22 +0100 |
|---|---|---|
| committer | Greg Farnum <greg@inktank.com> | 2013-04-30 13:50:40 -0700 |
| commit | a97eccadf75cd390ae84ed13d679d67720fda37b (patch) | |
| tree | 91735f84e8a0f5c59e2114909f3e5d6a2ac43158 | |
| parent | a39bbdf32e95475fea0abb5758206387d283fdd0 (diff) | |
| download | ceph-a97eccadf75cd390ae84ed13d679d67720fda37b.tar.gz | |
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>
| -rw-r--r-- | src/mon/Monitor.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index 431cb5d239d..e739ff1cdf8 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; |