osd/scrub: remove the unused current-time parameter

from both adjust_deep_schedule() and adjust_shallow_schedule().
In both cases, we only rely on the 'last' stamps to
determine the next scheduled time.

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 5d0cd38cae3be80e8f92af3744c6b0416726a4c5..3a97b84977c29ce09926f191057b433951b0ed9a 100644 (file)
--- a/src/osd/scrubber/pg_scrubber.cc
+++ b/src/osd/scrubber/pg_scrubber.cc
@@ -480,10 +480,9 @@ void PgScrubber::update_targets(utime_t scrub_clock_now)
 
   // the next periodic scrubs:
   m_scrub_job->adjust_shallow_schedule(
-      m_pg->info.history.last_scrub_stamp, applicable_conf, scrub_clock_now);
+      m_pg->info.history.last_scrub_stamp, applicable_conf);
   m_scrub_job->adjust_deep_schedule(
-      m_pg->info.history.last_deep_scrub_stamp, applicable_conf,
-      scrub_clock_now);
+      m_pg->info.history.last_deep_scrub_stamp, applicable_conf);
 
   dout(10) << fmt::format("{}: adjusted:{}", __func__, *m_scrub_job) << dendl;
 }

diff --git a/src/osd/scrubber/scrub_job.cc b/src/osd/scrubber/scrub_job.cc
index a0f4418e887a326af0781a2c0e2d62630e089d9e..2c33492fb22bcd5f200bf78490e3bc38ae9a8b83 100644 (file)
--- a/src/osd/scrubber/scrub_job.cc
+++ b/src/osd/scrubber/scrub_job.cc
@@ -113,8 +113,7 @@ void ScrubJob::set_both_targets_queued()
 
 void ScrubJob::adjust_shallow_schedule(
     utime_t last_scrub,
-    const Scrub::sched_conf_t& app_conf,
-    utime_t scrub_clock_now)
+    const Scrub::sched_conf_t& app_conf)
 {
   dout(10) << fmt::format(
                  "at entry: shallow target:{}, conf:{}, last-stamp:{:s}",
@@ -250,8 +249,7 @@ utime_t ScrubJob::get_sched_time() const
 
 void ScrubJob::adjust_deep_schedule(
     utime_t last_deep,
-    const Scrub::sched_conf_t& app_conf,
-    utime_t scrub_clock_now)
+    const Scrub::sched_conf_t& app_conf)
 {
   dout(10) << fmt::format(
                  "at entry: deep target:{}, conf:{}, last-stamp:{:s}",

diff --git a/src/osd/scrubber/scrub_job.h b/src/osd/scrubber/scrub_job.h
index 5e9671f7d2e35ba8f4df3323149acf14b085d10d..7f1a9a241cf798e960b43e7758598bec63703ac5 100644 (file)
--- a/src/osd/scrubber/scrub_job.h
+++ b/src/osd/scrubber/scrub_job.h
@@ -217,13 +217,11 @@ class ScrubJob {
    */
   void adjust_shallow_schedule(
     utime_t last_scrub,
-    const Scrub::sched_conf_t& app_conf,
-    utime_t scrub_clock_now);
+    const Scrub::sched_conf_t& app_conf);
 
   void adjust_deep_schedule(
     utime_t last_deep,
-    const Scrub::sched_conf_t& app_conf,
-    utime_t scrub_clock_now);
+    const Scrub::sched_conf_t& app_conf);
 
   /**
    * For the level specified, set the 'not-before' time to 'now+delay',
@@ -275,6 +273,7 @@ class ScrubJob {
   std::string log_msg_prefix;
 
 
+
  /*
  * Restrictions and limitations that apply to each urgency level:
  * -------------------------------------------------------------