osd/scrub: fix set_last_deep_scrub_stamp()

ronen-fr · ronen-fr · commit af8939dd881a · 2024-01-22T08:29:25.000-06:00
The call should update last_scrub_stamp, too, without
requiring an extra call to on_scrub_schedule_input_change()

Signed-off-by: Ronen Friedman &lt;rfriedma@redhat.com&gt;
diff --git a/src/osd/PG.h b/src/osd/PG.h
@@ -281,6 +281,7 @@ class PG : public DoutPrefixProvider,
     recovery_state.update_stats(
       [t](auto &history, auto &stats) {
 	set_last_deep_scrub_stamp(t, history, stats);
+	set_last_scrub_stamp(t, history, stats);
 	return true;
       });
     on_scrub_schedule_input_change();
diff --git a/src/osd/scrubber/pg_scrubber.cc b/src/osd/scrubber/pg_scrubber.cc
@@ -715,10 +715,11 @@ void PgScrubber::on_operator_periodic_cmd(
   asok_response_section(f, true, scrub_level, stamp);
 
   if (scrub_level == scrub_level_t::deep) {
+    // this call sets both stamps
     m_pg->set_last_deep_scrub_stamp(stamp);
+  } else {
+    m_pg->set_last_scrub_stamp(stamp);
   }
-  // and in both cases:
-  m_pg->set_last_scrub_stamp(stamp);
 }
 
 // when asked to force a high-priority scrub

Original file line number	Diff line number	Diff line change
`@@ -715,10 +715,11 @@ void PgScrubber::on_operator_periodic_cmd(`
`715`	`715`	`asok_response_section(f, true, scrub_level, stamp);`
`716`	`716`
`717`	`717`	`if (scrub_level == scrub_level_t::deep) {`
	`718`	`+ // this call sets both stamps`
`718`	`719`	`m_pg->set_last_deep_scrub_stamp(stamp);`
	`720`	`+ } else {`
	`721`	`+ m_pg->set_last_scrub_stamp(stamp);`
`719`	`722`	`}`
`720`		`- // and in both cases:`
`721`		`- m_pg->set_last_scrub_stamp(stamp);`
`722`	`723`	`}`
`723`	`724`
`724`	`725`	`// when asked to force a high-priority scrub`