Merge pull request ceph#64211 from ronen-fr/wip-rf-noshard

ronen-fr · web-flow · commit 5aeaa104d865 · 2025-06-27T13:52:57.000+03:00
osd/scrub: 'starts' messages should name PGs, not shards

Reviewed-by: Aishwarya Mathuria &lt;amathuri@redhat.com&gt;
diff --git 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();
 }

Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ ActiveScrubbing::ActiveScrubbing(my_context ctx)`
`319`	`319`
`320`	`320`	`session.m_osd_counters->inc(session.m_counters_idx->active_started_cnt);`
`321`	`321`	`scrbr->get_clog()->debug()`
`322`		`- << fmt::format("{} {} starts", pg_id, scrbr->get_op_mode_text());`
	`322`	`+ << fmt::format("{} {} starts", pg_id.pgid, scrbr->get_op_mode_text());`
`323`	`323`
`324`	`324`	`scrbr->on_init();`
`325`	`325`	`}`