From: Sage Weil <sage@newdream.net>
Date: Thu, 17 Nov 2011 19:56:37 +0000 (-0800)
Subject: objecter: set skipped_map if we skip a map
X-Git-Tag: v0.39~45
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f1dd56d93d96ddc5bb08728673966a5f24339e0d;p=ceph-ci.git

objecter: set skipped_map if we skip a map

This ensures that we resend _all_ requests, since we aren't sure which
may have mapped to a different primary and then back.  This was missed in
the original implementation in 4fe9cca5dd63a1924be2b5cb18f542fb4b97a768.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index 40c5a4e48c0..8cdf5e100c7 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -398,6 +398,7 @@ void Objecter::handle_osd_map(MOSDMap *m)
 	  ldout(cct, 3) << "handle_osd_map missing epoch " << osdmap->get_epoch()+1
 			<< ", jumping to " << m->get_oldest() << dendl;
 	  e = m->get_oldest() - 1;
+	  skipped_map = true;
 	  continue;
 	}
 	logger->set(l_osdc_map_epoch, osdmap->get_epoch());