From 631899a97151a57f58ef13122a3a23db9cc65437 Mon Sep 17 00:00:00 2001 From: Ronen Friedman Date: Thu, 21 Sep 2023 04:59:11 -0500 Subject: [PATCH] osd/scrub: scheduler: removing unused code Signed-off-by: Ronen Friedman --- src/osd/scrubber/osd_scrub.cc | 12 +----------- src/osd/scrubber/osd_scrub.h | 12 ------------ 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/src/osd/scrubber/osd_scrub.cc b/src/osd/scrubber/osd_scrub.cc index 05750ecb20b..994a60f0b9a 100644 --- a/src/osd/scrubber/osd_scrub.cc +++ b/src/osd/scrubber/osd_scrub.cc @@ -114,7 +114,7 @@ void OsdScrub::initiate_scrub(bool is_recovery_active) if (g_conf()->subsys.should_gather()) { dout(20) << "scrub scheduling (@tick) starts" << dendl; - auto all_jobs = list_registered_jobs(); + auto all_jobs = m_queue.list_registered_jobs(); for (const auto& sj : all_jobs) { dout(20) << fmt::format("\tscrub-queue jobs: {}", *sj) << dendl; } @@ -503,13 +503,3 @@ void OsdScrub::clear_reserving_now() { m_queue.clear_reserving_now(); } - -bool OsdScrub::is_reserving_now() const -{ - return m_queue.is_reserving_now(); -} - -Scrub::ScrubQContainer OsdScrub::list_registered_jobs() const -{ - return m_queue.list_registered_jobs(); -} diff --git a/src/osd/scrubber/osd_scrub.h b/src/osd/scrubber/osd_scrub.h index 4bfbe1e646d..60e1f45adee 100644 --- a/src/osd/scrubber/osd_scrub.h +++ b/src/osd/scrubber/osd_scrub.h @@ -204,18 +204,6 @@ class OsdScrub { /// the queue of PGs waiting to be scrubbed ScrubQueue m_queue; - public: - // for this transitory commit only - to be moved elsewhere - /** - * @return the list (not std::set!) of all scrub jobs registered - * (apart from PGs in the process of being removed) - */ - Scrub::ScrubQContainer list_registered_jobs() const; - - /// one of this OSD's PGs is trying to acquire replica resources - bool is_reserving_now() const; - - private: const std::string m_log_prefix{}; /// number of PGs stuck while scrubbing, waiting for objects -- 2.39.5