From e988adca2a74cb39602f47fb6b827379ee111ab3 Mon Sep 17 00:00:00 2001 From: Matan Breizman Date: Wed, 1 Feb 2023 09:56:44 +0000 Subject: [PATCH] messages/MOSDMap: Remove get_oldest/newest cluster_osdmap_trim_lower_bound and newest_map are public. Signed-off-by: Matan Breizman (cherry picked from commit 0c5f02ed5c79232e81e4ce5e6656e7502acb0ac6) --- src/messages/MOSDMap.h | 7 ------- src/osdc/Objecter.cc | 7 ++++--- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/messages/MOSDMap.h b/src/messages/MOSDMap.h index a74873b040140..c9dd6991f85c5 100644 --- a/src/messages/MOSDMap.h +++ b/src/messages/MOSDMap.h @@ -68,13 +68,6 @@ public: (e == 0 || i->first > e)) e = i->first; return e; } - epoch_t get_oldest() { - return cluster_osdmap_trim_lower_bound; - } - epoch_t get_newest() { - return newest_map; - } - MOSDMap() : Message{CEPH_MSG_OSD_MAP, HEAD_VERSION, COMPAT_VERSION} { } MOSDMap(const uuid_d &f, const uint64_t features) diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc index e821b4ee00f04..b225c5236e513 100644 --- a/src/osdc/Objecter.cc +++ b/src/osdc/Objecter.cc @@ -1220,7 +1220,7 @@ void Objecter::handle_osd_map(MOSDMap *m) logger->inc(l_osdc_map_full); } else { - if (e >= m->get_oldest()) { + if (e >= m->cluster_osdmap_trim_lower_bound) { ldout(cct, 3) << "handle_osd_map requesting missing epoch " << osdmap->get_epoch()+1 << dendl; _maybe_request_map(); @@ -1228,8 +1228,9 @@ 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; + << ", jumping to " + << m->cluster_osdmap_trim_lower_bound << dendl; + e = m->cluster_osdmap_trim_lower_bound - 1; skipped_map = true; continue; } -- 2.39.5