diff options
| author | Joao Eduardo Luis <joao.luis@inktank.com> | 2013-04-30 18:45:22 +0100 |
|---|---|---|
| committer | Joao Eduardo Luis <joao.luis@inktank.com> | 2013-04-30 18:45:22 +0100 |
| commit | 4e40142bd2e6c00b15f7e20d0a7a97e78f8644c2 (patch) | |
| tree | 94d2a2961be8d6fd9a435fdea5b1b21f1c733908 | |
| parent | a3c165c9e2fd84d2d9d984dc1ed8dd58a218a5af (diff) | |
| download | ceph-wip-mon-compact-dbg.tar.gz | |
mon: Monitor: disregard paxos_max_join_drift when deciding whether to syncwip-mon-compact-dbg
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 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; |