summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2011-11-17 11:56:37 -0800
committerSage Weil <sage@newdream.net>2011-11-17 11:56:37 -0800
commitf1dd56d93d96ddc5bb08728673966a5f24339e0d (patch)
treef02ffee2575f97fbf79644c68331c6830c49873c
parent5afef0209ffbbbdc89daf88a1770e1e3de9f6317 (diff)
downloadceph-f1dd56d93d96ddc5bb08728673966a5f24339e0d.tar.gz
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>
-rw-r--r--src/osdc/Objecter.cc1
1 files changed, 1 insertions, 0 deletions
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());