sd/scrub: preemption_data_t needs not keep a PG ref

ronen-fr · ronen-fr · commit 345911ef2ba6 · 2025-03-31T23:37:35.000-05:00
Removing the PG* from PgScrubber::preemption_data_t.
Mainly - to simplify the creation of unit-tests for the
PgScrubber class.

Signed-off-by: Ronen Friedman &lt;rfriedma@redhat.com&gt;
diff --git a/src/osd/scrubber/pg_scrubber.cc b/src/osd/scrubber/pg_scrubber.cc
@@ -2795,7 +2795,7 @@ void PgScrubber::update_scrub_stats(ceph::coarse_real_clock::time_point now_is)
 
 // ///////////////////// preemption_data_t //////////////////////////////////
 
-PgScrubber::preemption_data_t::preemption_data_t(PG* pg) : m_pg{pg},
+PgScrubber::preemption_data_t::preemption_data_t(PG* pg) :
   osd_scrub_max_preemptions{pg->cct->_conf, "osd_scrub_max_preemptions"}
 {
   m_left = *osd_scrub_max_preemptions;
diff --git a/src/osd/scrubber/pg_scrubber.h b/src/osd/scrubber/pg_scrubber.h
@@ -1005,7 +1005,6 @@ class PgScrubber : public ScrubPgIF,
     }
 
    private:
-    PG* m_pg;
     mutable ceph::mutex m_preemption_lock = ceph::make_mutex("preemption_lock");
     bool m_preemptable{false};
     bool m_preempted{false};

Original file line number	Diff line number	Diff line change
`@@ -2795,7 +2795,7 @@ void PgScrubber::update_scrub_stats(ceph::coarse_real_clock::time_point now_is)`
`2795`	`2795`
`2796`	`2796`	`// ///////////////////// preemption_data_t //////////////////////////////////`
`2797`	`2797`
`2798`		`-PgScrubber::preemption_data_t::preemption_data_t(PG* pg) : m_pg{pg},`
	`2798`	`+PgScrubber::preemption_data_t::preemption_data_t(PG* pg) :`
`2799`	`2799`	`osd_scrub_max_preemptions{pg->cct->_conf, "osd_scrub_max_preemptions"}`
`2800`	`2800`	`{`
`2801`	`2801`	`m_left = *osd_scrub_max_preemptions;`
Original file line number	Diff line number	Diff line change
`@@ -1005,7 +1005,6 @@ class PgScrubber : public ScrubPgIF,`
`1005`	`1005`	`}`
`1006`	`1006`
`1007`	`1007`	`private:`
`1008`		`- PG* m_pg;`
`1009`	`1008`	`mutable ceph::mutex m_preemption_lock = ceph::make_mutex("preemption_lock");`
`1010`	`1009`	`bool m_preemptable{false};`
`1011`	`1010`	`bool m_preempted{false};`