]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
osd/crimson/pg: support cluster_osdmap_trim_lower_bound()
authorMatan Breizman <mbreizma@redhat.com>
Thu, 9 Nov 2023 16:34:44 +0000 (16:34 +0000)
committerMatan Breizman <mbreizma@redhat.com>
Wed, 29 Nov 2023 09:23:44 +0000 (09:23 +0000)
Signed-off-by: Matan Breizman <mbreizma@redhat.com>
src/crimson/osd/pg.h
src/crimson/osd/shard_services.h

index 056d5e9e1c0036c5319bedf7fa51ae520cb8fcc1..f56f2dc662731def1b155d60927e39c29442b4f3 100644 (file)
@@ -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 {
index 5df425a243cfe0a377b5dc249aa5e30ec7e9db28..51720d706ebe79034b92af277ddbbb444ae97067 100644 (file)
@@ -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)