crimson: update PGRecovery::recover_object_with_throttle to use logging macros

Signed-off-by: Samuel Just <sjust@redhat.com>

diff --git a/src/crimson/osd/pg.h b/src/crimson/osd/pg.h
index 0a20f2c4d6241cd31d266d384749bfa1c0fbe863..110c5e79dad612495f5cf300d754f15f8e3eea07 100644 (file)
--- a/src/crimson/osd/pg.h
+++ b/src/crimson/osd/pg.h
@@ -733,6 +733,9 @@ public:
   ShardServices& get_shard_services() final {
     return shard_services;
   }
+  DoutPrefixProvider& get_dpp() final {
+    return *this;
+  }
   seastar::future<> stop();
 private:
   class C_PG_FinishRecovery : public Context {

diff --git a/src/crimson/osd/pg_recovery.cc b/src/crimson/osd/pg_recovery.cc
index 2b28f7e4f0f4b44e7b72aa62a762b4c4cb42cd5d..c7b41b7066351c7b10600938d15f30d994b50e91 100644 (file)
--- a/src/crimson/osd/pg_recovery.cc
+++ b/src/crimson/osd/pg_recovery.cc
@@ -5,6 +5,7 @@
 #include <fmt/ostream.h>
 #include <fmt/ranges.h>
 
+#include "crimson/common/log.h"
 #include "crimson/common/type_helpers.h"
 #include "crimson/osd/backfill_facades.h"
 #include "crimson/osd/osd_operations/background_recovery.h"
@@ -16,6 +17,8 @@
 #include "osd/osd_types.h"
 #include "osd/PeeringState.h"
 
+SET_SUBSYS(osd);
+
 namespace {
   seastar::logger& logger() {
     return crimson::get_logger(ceph_subsys_osd);
@@ -525,14 +528,15 @@ PGRecovery::recover_object_with_throttle(
   const hobject_t &soid,
   eversion_t need)
 {
+  LOG_PREFIX(PGRecovery::recover_object_with_throttle);
   crimson::osd::scheduler::params_t params =
     {1, 0, crimson::osd::scheduler::scheduler_class_t::background_best_effort};
   auto &ss = pg->get_shard_services();
-  logger().debug("{} {}", soid, need);
+  DEBUGDPP("{} {}", pg->get_dpp(), soid, need);
   return ss.with_throttle(
     std::move(params),
-    [this, soid, need] {
-    logger().debug("got throttle: {} {}", soid, need);
+    [FNAME, this, soid, need] {
+    DEBUGDPP("got throttle: {} {}", pg->get_dpp(), soid, need);
     auto backend = pg->get_recovery_backend();
     assert(backend);
     return backend->recover_object(soid, need);

diff --git a/src/crimson/osd/pg_recovery_listener.h b/src/crimson/osd/pg_recovery_listener.h
index 6c88b170b4fb981e59478f1ff588ee5116feecc4..347a3b2194e3187f3c324ac87ddc1151526fa137 100644 (file)
--- a/src/crimson/osd/pg_recovery_listener.h
+++ b/src/crimson/osd/pg_recovery_listener.h
@@ -20,6 +20,7 @@ class PGRecovery;
 class PGRecoveryListener {
 public:
   virtual crimson::osd::ShardServices& get_shard_services() = 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;