diff options
| author | Sage Weil <sage@inktank.com> | 2013-07-28 08:55:38 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-07-29 12:11:35 -0700 |
| commit | e24b50225c841a650d9303041bbe811e04bdd668 (patch) | |
| tree | 29d1f4f32d123c2c83e116c0c15bf001ae2200f3 | |
| parent | 12c1f1157c7b9513a3d9f716a8ec62fce00d28f5 (diff) | |
| download | ceph-e24b50225c841a650d9303041bbe811e04bdd668.tar.gz | |
osd: fix off-by-one in map gap logic
If we have map 250, and monitor's first is 251, but sends 260, we can
request the intervening range.
Fixes: #5784
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
| -rw-r--r-- | src/osd/OSD.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index e3a7c227e15..3fd818e04e3 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -4958,7 +4958,7 @@ void OSD::handle_osd_map(MOSDMap *m) dout(10) << "handle_osd_map message skips epochs " << osdmap->get_epoch() + 1 << ".." << (first-1) << dendl; if ((m->oldest_map < first && osdmap->get_epoch() == 0) || - m->oldest_map <= osdmap->get_epoch()) { + m->oldest_map <= osdmap->get_epoch() + 1) { monc->sub_want("osdmap", osdmap->get_epoch()+1, CEPH_SUBSCRIBE_ONETIME); monc->renew_subs(); m->put(); |