]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
objecter: simplify map request check
authorSage Weil <sage@newdream.net>
Thu, 17 Nov 2011 20:08:40 +0000 (12:08 -0800)
committerSage Weil <sage.weil@dreamhost.com>
Mon, 21 Nov 2011 17:19:59 +0000 (09:19 -0800)
We should request a missing/intervening map if it appears to exist.
Otherwise, skip it.

Signed-off-by: Sage Weil <sage@newdream.net>
src/osdc/Objecter.cc

index 9dd8f1685e349c805ed6378a37f553138c22db76..539242eefbadb892913b47a296fd6d552fc36d4f 100644 (file)
@@ -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;