From: Kefu Chai <k.chai@proxmox.com>
Date: Tue, 16 Jun 2026 12:19:11 +0000 (+0800)
Subject: crimson/osd: fix malformed debug log format strings
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cb5ea45c28fd20d996d5875dbdb7148eb728d3a6;p=ceph.git

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 <k.chai@proxmox.com>
---

diff --git a/src/crimson/osd/osd_operations/client_request.cc b/src/crimson/osd/osd_operations/client_request.cc
index d470d8bb35e..f1a5d400496 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 f79e8272d99..dfd756f9908 100644
--- a/src/crimson/osd/pg.cc
+++ b/src/crimson/osd/pg.cc
@@ -760,7 +760,7 @@ PG::interruptible_future<bool> 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 6a2e57d0992..e17c7aa9d41 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()) {