diff options
| author | Sage Weil <sage@newdream.net> | 2011-11-17 12:08:40 -0800 |
|---|---|---|
| committer | Sage Weil <sage.weil@dreamhost.com> | 2011-11-21 09:19:59 -0800 |
| commit | 88963a181adb8fadb3df5a4a6c8d9d7fd56ad972 (patch) | |
| tree | ebd650fc177d95f790a97ddf9507416dd387d94a | |
| parent | cd2e523fba1d6cf8d15e7a349ad700b744f24ecf (diff) | |
| download | ceph-88963a181adb8fadb3df5a4a6c8d9d7fd56ad972.tar.gz | |
objecter: simplify map request check
We should request a missing/intervening map if it appears to exist.
Otherwise, skip it.
Signed-off-by: Sage Weil <sage@newdream.net>
| -rw-r--r-- | src/osdc/Objecter.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc index 9dd8f1685e3..539242eefba 100644 --- a/src/osdc/Objecter.cc +++ b/src/osdc/Objecter.cc @@ -395,7 +395,7 @@ void Objecter::handle_osd_map(MOSDMap *m) logger->inc(l_osdc_map_full); } else { - if (m->get_first() > m->get_oldest() || e == m->get_first()) { + if (e && e > m->get_oldest()) { ldout(cct, 3) << "handle_osd_map requesting missing epoch " << osdmap->get_epoch()+1 << dendl; maybe_request_map(); break; |