From c7821d0a442f6e30b12a9b4ba8f74a64a0429891 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Wed, 8 Jan 2025 00:51:18 +0000 Subject: [PATCH] crimson/.../recovery_backend: convert to logging macros, some formatting changes Signed-off-by: Samuel Just --- src/crimson/osd/recovery_backend.cc | 69 ++++++++++++++++------------- 1 file changed, 38 insertions(+), 31 deletions(-) diff --git a/src/crimson/osd/recovery_backend.cc b/src/crimson/osd/recovery_backend.cc index e390d51ed06b8..f1dd797d254f8 100644 --- a/src/crimson/osd/recovery_backend.cc +++ b/src/crimson/osd/recovery_backend.cc @@ -5,6 +5,7 @@ #include "crimson/common/coroutine.h" #include "crimson/common/exception.h" +#include "crimson/common/log.h" #include "crimson/osd/recovery_backend.h" #include "crimson/osd/pg.h" #include "crimson/osd/pg_backend.h" @@ -13,23 +14,20 @@ #include "messages/MOSDFastDispatchOp.h" #include "osd/osd_types.h" -namespace { - seastar::logger& logger() { - return crimson::get_logger(ceph_subsys_osd); - } -} +SET_SUBSYS(osd); hobject_t RecoveryBackend::get_temp_recovery_object( const hobject_t& target, eversion_t version) const { + LOG_PREFIX(RecoveryBackend::get_temp_recovery_object); hobject_t hoid = target.make_temp_hobject(fmt::format("temp_recovering_{}_{}_{}_{}", pg.get_info().pgid, version, pg.get_info().history.same_interval_since, target.snap)); - logger().debug("{} {}", __func__, hoid); + DEBUGDPP("{}", pg, hoid); return hoid; } @@ -123,7 +121,8 @@ void RecoveryBackend::handle_backfill_finish( MOSDPGBackfill& m, crimson::net::ConnectionXcoreRef conn) { - logger().debug("{}", __func__); + LOG_PREFIX(RecoveryBackend::handle_backfill_finish); + DEBUGDPP("", pg); ceph_assert(!pg.is_primary()); ceph_assert(crimson::common::local_conf()->osd_kill_backfill_at != 1); auto reply = crimson::make_message( @@ -146,7 +145,8 @@ RecoveryBackend::interruptible_future<> RecoveryBackend::handle_backfill_progress( MOSDPGBackfill& m) { - logger().debug("{}", __func__); + LOG_PREFIX(RecoveryBackend::handle_backfill_progress); + DEBUGDPP("", pg); ceph_assert(!pg.is_primary()); ceph_assert(crimson::common::local_conf()->osd_kill_backfill_at != 2); @@ -156,7 +156,7 @@ RecoveryBackend::handle_backfill_progress( m.stats, m.op == MOSDPGBackfill::OP_BACKFILL_PROGRESS, t); - logger().debug("RecoveryBackend::handle_backfill_progress: do_transaction..."); + DEBUGDPP("submitting transaction", pg); return shard_services.get_store().do_transaction( pg.get_collection_ref(), std::move(t)).or_terminate(); } @@ -165,7 +165,8 @@ RecoveryBackend::interruptible_future<> RecoveryBackend::handle_backfill_finish_ack( MOSDPGBackfill& m) { - logger().debug("{}", __func__); + LOG_PREFIX(RecoveryBackend::handle_backfill_finish_ack); + DEBUGDPP("", pg); ceph_assert(pg.is_primary()); ceph_assert(crimson::common::local_conf()->osd_kill_backfill_at != 3); auto recovery_handler = pg.get_recovery_handler(); @@ -178,9 +179,10 @@ RecoveryBackend::handle_backfill( MOSDPGBackfill& m, crimson::net::ConnectionXcoreRef conn) { - logger().debug("{}", __func__); + LOG_PREFIX(RecoveryBackend::handle_backfill); + DEBUGDPP("", pg); if (pg.old_peering_msg(m.map_epoch, m.query_epoch)) { - logger().debug("{}: discarding {}", __func__, m); + DEBUGDPP("discarding {}", pg, m); return seastar::now(); } switch (m.op) { @@ -201,7 +203,8 @@ RecoveryBackend::interruptible_future<> RecoveryBackend::handle_backfill_remove( MOSDPGBackfillRemove& m) { - logger().debug("{} m.ls={}", __func__, m.ls); + LOG_PREFIX(RecoveryBackend::handle_backfill_remove); + DEBUGDPP("m.ls={}", pg, m.ls); assert(m.get_type() == MSG_OSD_PG_BACKFILL_REMOVE); ObjectStore::Transaction t; @@ -211,7 +214,7 @@ RecoveryBackend::handle_backfill_remove( pg.remove_maybe_snapmapped_object(t, soid); }); } - logger().debug("RecoveryBackend::handle_backfill_remove: do_transaction..."); + DEBUGDPP("submitting transaction", pg); co_await interruptor::make_interruptible( shard_services.get_store().do_transaction( pg.get_collection_ref(), std::move(t)).or_terminate()); @@ -223,16 +226,17 @@ RecoveryBackend::scan_for_backfill( [[maybe_unused]] const std::int64_t min, const std::int64_t max) { - logger().debug("{} starting from {}", __func__, start); + LOG_PREFIX(RecoveryBackend::scan_for_backfill); + DEBUGDPP("starting from {}", pg, start); auto version_map = seastar::make_lw_shared>(); return backend->list_objects(start, max).then_interruptible( - [this, start, version_map] (auto&& ret) { + [FNAME, this, start, version_map] (auto&& ret) { auto&& [objects, next] = std::move(ret); return seastar::do_with( std::move(objects), - [this, version_map](auto &objects) { + [FNAME, this, version_map](auto &objects) { return interruptor::parallel_for_each(objects, - [this, version_map] (const hobject_t& object) + [FNAME, this, version_map] (const hobject_t& object) -> interruptible_future<> { crimson::osd::ObjectContextRef obc; if (pg.is_primary()) { @@ -240,8 +244,8 @@ RecoveryBackend::scan_for_backfill( } if (obc) { if (obc->obs.exists) { - logger().debug("scan_for_backfill found (primary): {} {}", - object, obc->obs.oi.version); + DEBUGDPP("found (primary): {} {}", + pg, object, obc->obs.oi.version); version_map->emplace(object, obc->obs.oi.version); } else { // if the object does not exist here, it must have been removed @@ -251,25 +255,25 @@ RecoveryBackend::scan_for_backfill( return seastar::now(); } else { return backend->load_metadata(object).safe_then_interruptible( - [version_map, object] (auto md) { + [FNAME, this, version_map, object] (auto md) { if (md->os.exists) { - logger().debug("scan_for_backfill found: {} {}", - object, md->os.oi.version); + DEBUGDPP("found: {} {}", pg, + object, md->os.oi.version); version_map->emplace(object, md->os.oi.version); } return seastar::now(); }, PGBackend::load_metadata_ertr::assert_all{}); } }); - }).then_interruptible([version_map, start=std::move(start), next=std::move(next), this] { + }).then_interruptible([FNAME, this, version_map, start=std::move(start), next=std::move(next)] { BackfillInterval bi; bi.begin = std::move(start); bi.end = std::move(next); bi.version = pg.get_info().last_update; bi.objects = std::move(*version_map); - logger().debug("{} BackfillInterval filled, leaving, {}", - "scan_for_backfill", - bi); + DEBUGDPP("{} BackfillInterval filled, leaving, {}", + "scan_for_backfill", + pg, bi); return seastar::make_ready_future(std::move(bi)); }); }); @@ -280,7 +284,8 @@ RecoveryBackend::handle_scan_get_digest( MOSDPGScan& m, crimson::net::ConnectionXcoreRef conn) { - logger().debug("{}", __func__); + LOG_PREFIX(RecoveryBackend::handle_scan_get_digest); + DEBUGDPP("", pg); if (false /* FIXME: check for backfill too full */) { std::ignore = shard_services.start_operation( // TODO: abstract start_background_recovery @@ -316,7 +321,8 @@ RecoveryBackend::interruptible_future<> RecoveryBackend::handle_scan_digest( MOSDPGScan& m) { - logger().debug("{}", __func__); + LOG_PREFIX(RecoveryBackend::handle_scan_digest); + DEBUGDPP("", pg); // Check that from is in backfill_targets vector ceph_assert(pg.is_backfill_target(m.from)); @@ -342,9 +348,10 @@ RecoveryBackend::handle_scan( MOSDPGScan& m, crimson::net::ConnectionXcoreRef conn) { - logger().debug("{}", __func__); + LOG_PREFIX(RecoveryBackend::handle_scan); + DEBUGDPP("", pg); if (pg.old_peering_msg(m.map_epoch, m.query_epoch)) { - logger().debug("{}: discarding {}", __func__, m); + DEBUGDPP("discarding {}", pg, m); return seastar::now(); } switch (m.op) { -- 2.39.5