From: Ronen Friedman <rfriedma@redhat.com>
Date: Thu, 26 Jun 2025 13:27:57 +0000 (-0500)
Subject: osd/scrub: 'starts' messages should name PGs, not shards
X-Git-Tag: v20.1.0~163^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F64212%2Fhead;p=ceph.git

osd/scrub: 'starts' messages should name PGs, not shards

By mistake, the 'scrub starts' message included the shard ID
of the primary OSD, instead of just the PG ID.

Fixes: https://tracker.ceph.com/issues/71780
Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
(cherry picked from commit e8cde5811f07f0847a1aac20279aa83f57e4562d)
---

diff --git a/src/osd/scrubber/scrub_machine.cc b/src/osd/scrubber/scrub_machine.cc
index d6cf2c03b967..2d21c8d25c84 100644
--- a/src/osd/scrubber/scrub_machine.cc
+++ b/src/osd/scrubber/scrub_machine.cc
@@ -319,7 +319,7 @@ ActiveScrubbing::ActiveScrubbing(my_context ctx)
 
   session.m_osd_counters->inc(session.m_counters_idx->active_started_cnt);
   scrbr->get_clog()->debug()
-      << fmt::format("{} {} starts", pg_id, scrbr->get_op_mode_text());
+      << fmt::format("{} {} starts", pg_id.pgid, scrbr->get_op_mode_text());
 
   scrbr->on_init();
 }