From: Ronen Friedman <rfriedma@redhat.com>
Date: Sun, 28 Dec 2025 12:47:17 +0000 (+0000)
Subject: osd/scrub: rename legacy 'scrub_reg_stamp' field
X-Git-Tag: testing/wip-pdonnell-testing-20260127.160833-debug~25^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a174744c7091224ed75b87e618584dc26d810a0e;p=ceph-ci.git

osd/scrub: rename legacy 'scrub_reg_stamp' field

to 'sched_time', to match all other query/dump instances
where this data item is listed.

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
---

diff --git a/src/osd/scrubber/pg_scrubber.cc b/src/osd/scrubber/pg_scrubber.cc
index ba2575aa48c..f29e97ef8a5 100644
--- a/src/osd/scrubber/pg_scrubber.cc
+++ b/src/osd/scrubber/pg_scrubber.cc
@@ -2290,8 +2290,7 @@ Scrub::schedule_result_t PgScrubber::start_scrub_session(
 
 
 ///\todo modify the fields dumped here to match the new scrub-job structure
-void PgScrubber::dump_scrubber(
-    ceph::Formatter* f) const
+void PgScrubber::dump_scrubber(ceph::Formatter* f) const
 {
   Formatter::ObjectSection scrubber_section{*f, "scrubber"sv};
 
@@ -2304,13 +2303,12 @@ void PgScrubber::dump_scrubber(
     const auto& earliest = m_scrub_job->earliest_target(now_is);
     f->dump_bool("must_scrub", earliest.is_high_priority());
     f->dump_bool(
-	"must_deep_scrub", m_scrub_job->deep_target.is_high_priority());
+        "must_deep_scrub", m_scrub_job->deep_target.is_high_priority());
     // the following data item is deprecated. Will be replaced by a set
     // of reported attributes that match the updated scrub-job state.
     f->dump_bool("must_repair", earliest.urgency() == urgency_t::must_repair);
-
-    f->dump_stream("scrub_reg_stamp")
-	<< earliest.sched_info.schedule.not_before;
+    f->dump_named_fmt(
+        "sched_time", "{}", earliest.sched_info.schedule.not_before);
     auto sched_state = m_scrub_job->scheduling_state(now_is);
     f->dump_string("schedule", sched_state);
     f->dump_named_fmt("urgency", "{}", earliest.urgency());
diff --git a/src/osd/scrubber/pg_scrubber.h b/src/osd/scrubber/pg_scrubber.h
index 1d132e9cfd5..e88e604083e 100644
--- a/src/osd/scrubber/pg_scrubber.h
+++ b/src/osd/scrubber/pg_scrubber.h
@@ -576,8 +576,6 @@ class PgScrubber : public ScrubPgIF,
 
   virtual void _scrub_clear_state() {}
 
-  utime_t m_scrub_reg_stamp;		///< stamp we registered for
-
   /// the sub-object that manages this PG's scheduling parameters.
   /// An Optional instead of a regular member, as we wish to directly
   /// control the order of construction/destruction.