From a7cfb75b68b273c5113eb3ca21801870b0b5ee3d Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Wed, 21 May 2025 14:42:20 +0000 Subject: [PATCH] crimson/osd: switch return type of PG::get_dpp to unify with ECListener Signed-off-by: Radoslaw Zarzynski --- src/crimson/osd/pg.h | 7 ++----- src/crimson/osd/pg_recovery.cc | 4 ++-- src/crimson/osd/pg_recovery_listener.h | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/crimson/osd/pg.h b/src/crimson/osd/pg.h index 4bcff9a4fd6..64e0d9f98ca 100644 --- a/src/crimson/osd/pg.h +++ b/src/crimson/osd/pg.h @@ -179,9 +179,6 @@ public: const PGLog &get_log() const override { return peering_state.get_pg_log(); } - DoutPrefixProvider *get_dpp() override { - return this; - } void add_temp_obj(const hobject_t &oid) override { get_backend().add_temp_obj(oid); } @@ -931,8 +928,8 @@ public: ShardServices& get_shard_services() final { return shard_services; } - DoutPrefixProvider& get_dpp() final { - return *this; + DoutPrefixProvider* get_dpp() final { + return this; } seastar::future<> stop(); private: diff --git a/src/crimson/osd/pg_recovery.cc b/src/crimson/osd/pg_recovery.cc index 09ae3c204dd..89db49d1c91 100644 --- a/src/crimson/osd/pg_recovery.cc +++ b/src/crimson/osd/pg_recovery.cc @@ -517,13 +517,13 @@ PGRecovery::recover_object_with_throttle( eversion_t need) { LOG_PREFIX(PGRecovery::recover_object_with_throttle); - DEBUGDPP("{} {}", pg->get_dpp(), soid, need); + DEBUGDPP("{} {}", *pg->get_dpp(), soid, need); auto releaser = co_await interruptor::make_interruptible( pg->get_shard_services().get_throttle( crimson::osd::scheduler::params_t{ 1, 0, 0, SchedulerClass::background_best_effort })); - DEBUGDPP("got throttle: {} {}", pg->get_dpp(), soid, need); + DEBUGDPP("got throttle: {} {}", *pg->get_dpp(), soid, need); co_await pg->get_recovery_backend()->recover_object(soid, need); co_return; } diff --git a/src/crimson/osd/pg_recovery_listener.h b/src/crimson/osd/pg_recovery_listener.h index 97aca3c8c72..875f5d9c139 100644 --- a/src/crimson/osd/pg_recovery_listener.h +++ b/src/crimson/osd/pg_recovery_listener.h @@ -18,7 +18,7 @@ class PGRecovery; class PGRecoveryListener { public: virtual crimson::osd::ShardServices& get_shard_services() = 0; - virtual DoutPrefixProvider& get_dpp() = 0; + virtual DoutPrefixProvider* get_dpp() = 0; virtual PGRecovery* get_recovery_handler() = 0; virtual epoch_t get_osdmap_epoch() const = 0; virtual bool is_primary() const = 0; -- 2.47.3