crimson/osd: switch return type of PG::get_dpp to unify with ECListener

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

diff --git a/src/crimson/osd/pg.h b/src/crimson/osd/pg.h
index 9ab797517b17983e0e0fbe2894f0f01b3f371791..3cac152ebc968fe5c08db3478670a5be53947275 100644 (file)
--- a/src/crimson/osd/pg.h
+++ b/src/crimson/osd/pg.h
@@ -177,9 +177,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);
   }
@@ -923,8 +920,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 2e36d63a8f84312d970255f153666e4a830ff47d..b241838a42462f2d4d77f97a1a676276ab1ca381 100644 (file)
--- 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 97aca3c8c7259f2bd2efdd3883370519168ac4cd..875f5d9c13915ec0402f988468bd5df9d448ad0f 100644 (file)
--- 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;