osd/scrub: scheduler: removing unused code

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

diff --git a/src/osd/scrubber/osd_scrub.cc b/src/osd/scrubber/osd_scrub.cc
index 05750ecb20b56ce6fc43a666b9d66453f60487b1..994a60f0b9a304c2040b52c78fdd91ec023e04a7 100644 (file)
--- 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<ceph_subsys_osd, 20>()) {
     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 4bfbe1e646dfefb0653cb39933875eb6ca8fe93e..60e1f45adee9ee82738592465d6502fe9b32acc0 100644 (file)
--- 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