Skip to content

Commit b3e55c4

Browse files
committed
crimson: update PGRecovery::recover_object_with_throttle to use logging macros
Signed-off-by: Samuel Just <[email protected]>
1 parent 1c009f4 commit b3e55c4

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

src/crimson/osd/pg.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -733,6 +733,9 @@ class PG : public boost::intrusive_ref_counter<
733733
ShardServices& get_shard_services() final {
734734
return shard_services;
735735
}
736+
DoutPrefixProvider& get_dpp() final {
737+
return *this;
738+
}
736739
seastar::future<> stop();
737740
private:
738741
class C_PG_FinishRecovery : public Context {

src/crimson/osd/pg_recovery.cc

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include <fmt/ostream.h>
66
#include <fmt/ranges.h>
77

8+
#include "crimson/common/log.h"
89
#include "crimson/common/type_helpers.h"
910
#include "crimson/osd/backfill_facades.h"
1011
#include "crimson/osd/osd_operations/background_recovery.h"
@@ -16,6 +17,8 @@
1617
#include "osd/osd_types.h"
1718
#include "osd/PeeringState.h"
1819

20+
SET_SUBSYS(osd);
21+
1922
namespace {
2023
seastar::logger& logger() {
2124
return crimson::get_logger(ceph_subsys_osd);
@@ -525,14 +528,15 @@ PGRecovery::recover_object_with_throttle(
525528
const hobject_t &soid,
526529
eversion_t need)
527530
{
531+
LOG_PREFIX(PGRecovery::recover_object_with_throttle);
528532
crimson::osd::scheduler::params_t params =
529533
{1, 0, crimson::osd::scheduler::scheduler_class_t::background_best_effort};
530534
auto &ss = pg->get_shard_services();
531-
logger().debug("{} {}", soid, need);
535+
DEBUGDPP("{} {}", pg->get_dpp(), soid, need);
532536
return ss.with_throttle(
533537
std::move(params),
534-
[this, soid, need] {
535-
logger().debug("got throttle: {} {}", soid, need);
538+
[FNAME, this, soid, need] {
539+
DEBUGDPP("got throttle: {} {}", pg->get_dpp(), soid, need);
536540
auto backend = pg->get_recovery_backend();
537541
assert(backend);
538542
return backend->recover_object(soid, need);

src/crimson/osd/pg_recovery_listener.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ class PGRecovery;
2020
class PGRecoveryListener {
2121
public:
2222
virtual crimson::osd::ShardServices& get_shard_services() = 0;
23+
virtual DoutPrefixProvider& get_dpp() = 0;
2324
virtual PGRecovery* get_recovery_handler() = 0;
2425
virtual epoch_t get_osdmap_epoch() const = 0;
2526
virtual bool is_primary() const = 0;

0 commit comments

Comments
 (0)