From: Sage Weil <sage@newdream.net>
Date: Thu, 17 Nov 2011 20:08:40 +0000 (-0800)
Subject: objecter: simplify map request check
X-Git-Tag: v0.39~26
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=88963a181adb8fadb3df5a4a6c8d9d7fd56ad972;p=ceph.git

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>
---

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index 9dd8f1685e349..539242eefbadb 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;