From: Ronen Friedman Date: Tue, 20 Jan 2026 14:05:15 +0000 (+0000) Subject: osd/scrub: removing the unused next_deepscrub_interval() X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=531c30cd0b867aff1f7e1f1bf6eb6d657f7eb93b;p=ceph.git osd/scrub: removing the unused next_deepscrub_interval() Signed-off-by: Ronen Friedman --- diff --git a/src/osd/PG.cc b/src/osd/PG.cc index 95a7c26cf8f16..7745ea5bb888b 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -1291,15 +1291,6 @@ Scrub::schedule_result_t PG::start_scrubbing( candidate.level, osd_restrictions, pg_cond); } -double PG::next_deepscrub_interval() const -{ - double deep_scrub_interval = - pool.info.opts.value_or(pool_opts_t::DEEP_SCRUB_INTERVAL, 0.0); - if (deep_scrub_interval <= 0.0) - deep_scrub_interval = cct->_conf->osd_deep_scrub_interval; - return info.history.last_deep_scrub_stamp + deep_scrub_interval; -} - void PG::on_scrub_schedule_input_change() { if (is_active() && is_primary() && !is_scrub_queued_or_active()) { diff --git a/src/osd/PG.h b/src/osd/PG.h index 43795697fd169..4432ccaf8fcde 100644 --- a/src/osd/PG.h +++ b/src/osd/PG.h @@ -710,9 +710,6 @@ public: unsigned int scrub_requeue_priority(Scrub::scrub_prio_t with_priority) const; private: - // auxiliaries used by sched_scrub(): - double next_deepscrub_interval() const; - using ScrubAPI = void (ScrubPgIF::*)(epoch_t epoch_queued); void forward_scrub_event(ScrubAPI fn, epoch_t epoch_queued, std::string_view desc); // and for events that carry a meaningful 'activation token'