From 06b0451a0d301f621f509f746790c80f686494bb Mon Sep 17 00:00:00 2001
From: Ronen Friedman <rfriedma@redhat.com>
Date: Sat, 4 Oct 2025 01:53:24 -0500
Subject: [PATCH] osd/scrub: log messages in build_scrub_map_chunk()

Changes to log messages priorities and to their format.

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
---
 src/osd/osd_types.cc            |  8 ++++----
 src/osd/scrubber/pg_scrubber.cc | 24 +++++++++++++++---------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index 1d7a665641d..29ee56ba041 100644
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -7391,13 +7391,13 @@ std::string ScrubMapBuilder::fmt_print() const
 {
   const string dtl_size = (pos < ls.size()) ? fmt::format(" {}", ls[pos]) : "";
   const string dtl_data_pos =
-      (data_pos < 0) ? "" : fmt::format(" byte {}", data_pos);
+      (data_pos < 0) ? "" : fmt::format(" byte:{}", data_pos);
   const string dtl_omap_pos =
-      omap_pos.empty() ? "" : fmt::format(" key {}", omap_pos);
+      omap_pos.empty() ? "" : fmt::format(" key:{}", omap_pos);
   const string dtl_deep = deep ? " deep" : "";
-  const string dtl_ret = ret ? "" : fmt::format(" {}", ret);
+  const string dtl_ret = ret ? "" : fmt::format(" ret:{}", ret);
   return fmt::format(
-      "({}/{}{} metadata_done {}{}{}{}{})", pos, ls.size(), dtl_size,
+      "({}/{}{} metadata_done:{}{}{}{}{})", pos, ls.size(), dtl_size,
       metadata_done, dtl_data_pos, dtl_omap_pos, dtl_deep, dtl_ret);
 }
 
diff --git a/src/osd/scrubber/pg_scrubber.cc b/src/osd/scrubber/pg_scrubber.cc
index eb9c0c697e3..16c2bb6b5bc 100644
--- a/src/osd/scrubber/pg_scrubber.cc
+++ b/src/osd/scrubber/pg_scrubber.cc
@@ -1351,8 +1351,9 @@ int PgScrubber::build_scrub_map_chunk(ScrubMap& map,
 				      hobject_t end,
 				      bool deep)
 {
-  dout(10) << __func__ << " [" << start << "," << end << ") "
-	   << " pos " << pos << " Deep: " << deep << dendl;
+  dout(10) << fmt::format("{}: [{}, {}) pos {} Deep: {}",
+                          __func__, start, end, pos, deep)
+           << dendl;
 
   // start
   while (pos.empty()) {
@@ -1366,16 +1367,21 @@ int PgScrubber::build_scrub_map_chunk(ScrubMap& map,
 							end,
 							&pos.ls,
 							&rollback_obs);
-    dout(10) << __func__ << " while pos empty " << pos.ret << dendl;
     if (pos.ret < 0) {
-      dout(5) << "objects_list_range error: " << pos.ret << dendl;
+      dout(5) << fmt::format("{}: objects_list_range error: {}", __func__,
+                pos.ret) << dendl;
       return pos.ret;
     }
-    dout(10) << __func__ << " pos.ls.empty()? " << (pos.ls.empty() ? "+" : "-")
-	     << dendl;
+    dout(20) << fmt::format("{} pos.ls.empty()? {}",
+                            __func__, (pos.ls.empty() ? "+" : "-"))
+             << dendl;
     if (pos.ls.empty()) {
       break;
     }
+    dout(10) << fmt::format(
+		    "{}: got {} objects. Searching the rollbacks. Rescheduling",
+                    __func__, pos.ls.size())
+	     << dendl;
     m_pg->_scan_rollback_obs(rollback_obs);
     pos.pos = 0;
     return -EINPROGRESS;
@@ -1383,13 +1389,13 @@ int PgScrubber::build_scrub_map_chunk(ScrubMap& map,
 
   // scan objects
   while (!pos.done()) {
-    int r =
+    const int r =
 	m_pg->get_pgbackend()->be_scan_list(get_unlabeled_counters(), map, pos);
-    dout(30) << __func__ << " BE returned " << r << dendl;
     if (r == -EINPROGRESS) {
-      dout(20) << __func__ << " in progress" << dendl;
+      dout(10) << fmt::format("{} : BE in progress", __func__) << dendl;
       return r;
     }
+    dout(30) << fmt::format("{} BE returned {}", __func__, r) << dendl;
   }
 
   // finish
-- 
2.39.5