From: Ronen Friedman Date: Tue, 9 Jan 2024 14:15:33 +0000 (-0600) Subject: osd/scrub: fix set_last_deep_scrub_stamp() X-Git-Tag: v19.3.0~182^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=af8939dd881aecc146dba80e1c129a2c8cc43f94;p=ceph.git osd/scrub: fix set_last_deep_scrub_stamp() The call should update last_scrub_stamp, too, without requiring an extra call to on_scrub_schedule_input_change() Signed-off-by: Ronen Friedman --- diff --git a/src/osd/PG.h b/src/osd/PG.h index 2a823f675969..677f4e93a079 100644 --- a/src/osd/PG.h +++ b/src/osd/PG.h @@ -281,6 +281,7 @@ public: 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 index 9cd082a87947..55fd7b18dcde 100644 --- 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