From 2c7eda690ae2f71c8e8e189b8f7330196c1f385f Mon Sep 17 00:00:00 2001 From: Ding Dinghua Date: Thu, 30 Oct 2014 14:58:42 +0800 Subject: [PATCH] osdc/Objecter: Fix a bug of dead looping in Objecter::handle_osd_map If current map epoch is less than oldest epoch, current map epoch should step up to oldest epoch. Fixes: #9986 Signed-off-by: Ding Dinghua (cherry picked from commit e0166a23c2cf655bfb4cf873be021a14d9b9be27) Conflicts: src/osdc/Objecter.cc the debug line that follows was re-indented --- src/osdc/Objecter.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc index 3c60c6c41fefd..649c61ce5c5f4 100644 --- a/src/osdc/Objecter.cc +++ b/src/osdc/Objecter.cc @@ -607,7 +607,7 @@ void Objecter::handle_osd_map(MOSDMap *m) logger->inc(l_osdc_map_full); } else { - if (e > m->get_oldest()) { + if (e >= m->get_oldest()) { ldout(cct, 3) << "handle_osd_map requesting missing epoch " << osdmap->get_epoch()+1 << dendl; maybe_request_map(); break; -- 2.39.5