From: Matan Breizman Date: Thu, 9 Nov 2023 16:34:44 +0000 (+0000) Subject: osd/crimson/pg: support cluster_osdmap_trim_lower_bound() X-Git-Tag: v19.0.0~4^2~3 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1d96a6c2a0cc439cfb790cbd22dc37af9ef1aefc;p=ceph.git osd/crimson/pg: support cluster_osdmap_trim_lower_bound() Signed-off-by: Matan Breizman --- diff --git a/src/crimson/osd/pg.h b/src/crimson/osd/pg.h index 056d5e9e1c00..f56f2dc66273 100644 --- a/src/crimson/osd/pg.h +++ b/src/crimson/osd/pg.h @@ -348,8 +348,7 @@ public: void on_active_advmap(const OSDMapRef &osdmap) final; epoch_t cluster_osdmap_trim_lower_bound() final { - // TODO - return 0; + return shard_services.get_osdmap_tlb(); } void on_backfill_reserved() final { diff --git a/src/crimson/osd/shard_services.h b/src/crimson/osd/shard_services.h index 5df425a243cf..51720d706ebe 100644 --- a/src/crimson/osd/shard_services.h +++ b/src/crimson/osd/shard_services.h @@ -77,6 +77,10 @@ class PerShardState { PerfCounters *perf = nullptr; PerfCounters *recoverystate_perf = nullptr; + const epoch_t& get_osdmap_tlb() { + return per_shard_superblock.cluster_osdmap_trim_lower_bound; + } + // Op Management OSDOperationRegistry registry; OperationThrottler throttler; @@ -514,6 +518,7 @@ public: FORWARD_TO_LOCAL_CONST(get_mnow) FORWARD_TO_LOCAL(get_hb_stamps) FORWARD_TO_LOCAL(update_shard_superblock) + FORWARD_TO_LOCAL(get_osdmap_tlb) FORWARD(pg_created, pg_created, local_state.pg_map)