From cb5ea45c28fd20d996d5875dbdb7148eb728d3a6 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 16 Jun 2026 20:19:11 +0800 Subject: [PATCH] crimson/osd: fix malformed debug log format strings a few debug() calls had format strings that did not match their arguments. with the seastar logger formatting at runtime these only threw an fmt error at the matching log level, or went unnoticed: - pg_backend.cc: "{}: object does not exist: {}" had two placeholders but one argument; drop the stray leading "{}: ". - pg.cc do_recover_missing(): the "need to wait for recovery ... version {}" message never passed the eversion_t; add it. - client_request.cc: a DEBUGDPP() carried an extra leading "{}: " on top of the prefix the macro already injects (also fix the "rwoedered" typo). Signed-off-by: Kefu Chai --- src/crimson/osd/osd_operations/client_request.cc | 2 +- src/crimson/osd/pg.cc | 2 +- src/crimson/osd/pg_backend.cc | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/crimson/osd/osd_operations/client_request.cc b/src/crimson/osd/osd_operations/client_request.cc index d470d8bb35e8..f1a5d4004961 100644 --- a/src/crimson/osd/osd_operations/client_request.cc +++ b/src/crimson/osd/osd_operations/client_request.cc @@ -624,7 +624,7 @@ bool ClientRequest::is_misdirected_replica_read(const PG& pg) const flags & CEPH_OSD_FLAG_BALANCE_READS || flags & CEPH_OSD_FLAG_LOCALIZE_READS) { if (op_info.rwordered()) { - DEBUGDPP("{}: dropping - rwoedered with balanced/localize read {}", pg, *this); + DEBUGDPP("dropping - reordered with balanced/localize read {}", pg, *this); return true; } if (!op_info.may_read()) { diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc index f79e8272d994..dfd756f99080 100644 --- a/src/crimson/osd/pg.cc +++ b/src/crimson/osd/pg.cc @@ -760,7 +760,7 @@ PG::interruptible_future PG::do_recover_missing( } DEBUGDPP( "reqid {} need to wait for recovery, {} version {}", - *this, reqid, soid); + *this, reqid, soid, ver); if (recovery_backend->is_recovering(soid)) { DEBUGDPP( "reqid {} object {} version {}, already recovering", diff --git a/src/crimson/osd/pg_backend.cc b/src/crimson/osd/pg_backend.cc index 6a2e57d0992f..e17c7aa9d419 100644 --- a/src/crimson/osd/pg_backend.cc +++ b/src/crimson/osd/pg_backend.cc @@ -1451,7 +1451,7 @@ PGBackend::omap_get_keys( object_stat_sum_t& delta_stats) const { if (!os.exists || os.oi.is_whiteout()) { - logger().debug("{}: object does not exist: {}", os.oi.soid); + logger().debug("object does not exist: {}", os.oi.soid); co_await ll_read_ierrorator::future<>(crimson::ct_error::enoent::make()); } std::string start_after; @@ -1545,7 +1545,7 @@ PGBackend::omap_cmp( object_stat_sum_t& delta_stats) const { if (!os.exists || os.oi.is_whiteout()) { - logger().debug("{}: object does not exist: {}", os.oi.soid); + logger().debug("object does not exist: {}", os.oi.soid); return crimson::ct_error::enoent::make(); } @@ -1581,7 +1581,7 @@ PGBackend::omap_get_vals( object_stat_sum_t& delta_stats) const { if (!os.exists || os.oi.is_whiteout()) { - logger().debug("{}: object does not exist: {}", os.oi.soid); + logger().debug("object does not exist: {}", os.oi.soid); co_await ll_read_ierrorator::future<>(crimson::ct_error::enoent::make()); } std::string start_after; @@ -1778,7 +1778,7 @@ PGBackend::omap_clear( object_stat_sum_t& delta_stats) { if (!os.exists || os.oi.is_whiteout()) { - logger().debug("{}: object does not exist: {}", os.oi.soid); + logger().debug("object does not exist: {}", os.oi.soid); return crimson::ct_error::enoent::make(); } if (!os.oi.is_omap()) { -- 2.47.3