From 3c8d7f0e63bd840153e467fdfe5264fb85c518cc Mon Sep 17 00:00:00 2001 From: Ronen Friedman Date: Mon, 9 Aug 2021 10:10:52 +0000 Subject: [PATCH] osd/scrub: remove the unused should_requeue_blocked_ops() Following the change in on_applied(), should_requeue_blocked_ops() is no longer in use. Signed-off-by: Ronen Friedman --- src/osd/PrimaryLogScrub.cc | 11 ----------- src/osd/PrimaryLogScrub.h | 9 --------- src/osd/pg_scrubber.h | 10 ---------- src/osd/scrubber_common.h | 4 ---- 4 files changed, 34 deletions(-) diff --git a/src/osd/PrimaryLogScrub.cc b/src/osd/PrimaryLogScrub.cc index 3747cd6984199..e1302f0ef31a9 100644 --- a/src/osd/PrimaryLogScrub.cc +++ b/src/osd/PrimaryLogScrub.cc @@ -585,14 +585,3 @@ void PrimaryLogScrub::stats_of_handled_objects(const object_stat_sum_t& delta_st } } } - -bool PrimaryLogScrub::should_requeue_blocked_ops(eversion_t last_recovery_applied) const -{ - if (!is_scrub_active()) { - // just verify that things indeed are quiet - ceph_assert(m_start == m_end); - return false; - } - - return last_recovery_applied >= m_subset_last_update; -} diff --git a/src/osd/PrimaryLogScrub.h b/src/osd/PrimaryLogScrub.h index 2cf0c71c300f7..78353d6dbb6ff 100644 --- a/src/osd/PrimaryLogScrub.h +++ b/src/osd/PrimaryLogScrub.h @@ -36,15 +36,6 @@ class PrimaryLogScrub : public PgScrubber { bool get_store_errors(const scrub_ls_arg_t& arg, scrub_ls_result_t& res_inout) const final; - /** - * should we requeue blocked ops? - * Yes - if our 'subset_last_applied' is less up-to-date than the - * new recovery_state.get_last_update_applied(). - * (used by PrimaryLogPG::op_applied()) - */ - [[nodiscard]] bool should_requeue_blocked_ops( - eversion_t last_recovery_applied) const final; - void stats_of_handled_objects(const object_stat_sum_t& delta_stats, const hobject_t& soid) final; diff --git a/src/osd/pg_scrubber.h b/src/osd/pg_scrubber.h index fdee52e6f3532..0ed1f6c9b540c 100644 --- a/src/osd/pg_scrubber.h +++ b/src/osd/pg_scrubber.h @@ -306,16 +306,6 @@ class PgScrubber : public ScrubPgIF, public ScrubMachineListener { /// handle a message carrying a replica map void map_from_replica(OpRequestRef op) final; - /** - * should we requeue blocked ops? - * Applicable to the PrimaryLogScrub derived class. - */ - [[nodiscard]] virtual bool should_requeue_blocked_ops( - eversion_t last_recovery_applied) const override - { - return false; - } - void scrub_clear_state() final; /** diff --git a/src/osd/scrubber_common.h b/src/osd/scrubber_common.h index 22913875813eb..538e4c0d32e0b 100644 --- a/src/osd/scrubber_common.h +++ b/src/osd/scrubber_common.h @@ -206,10 +206,6 @@ struct ScrubPgIF { virtual void add_callback(Context* context) = 0; - /// should we requeue blocked ops? - [[nodiscard]] virtual bool should_requeue_blocked_ops( - eversion_t last_recovery_applied) const = 0; - /// add to scrub statistics, but only if the soid is below the scrub start virtual void stats_of_handled_objects(const object_stat_sum_t& delta_stats, const hobject_t& soid) = 0; -- 2.39.5