From: Aishwarya Mathuria Date: Mon, 18 Mar 2024 07:53:00 +0000 (+0000) Subject: osd: Remove OSDService::get_scrub_cost() X-Git-Tag: testing/wip-yuriw-testing-20240424.000125-main^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=77dda5ef03979bbaa6c9c8d9bae60d5b1769f6a8;p=ceph-ci.git osd: Remove OSDService::get_scrub_cost() After the addition of PgScrubber::get_scrub_cost(), this method will no longer be in use and can be removed. Signed-off-by: Aishwarya Mathuria --- diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index c451e99dd80..4fdde92d0c6 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -1798,17 +1798,6 @@ void OSDService::queue_scrub_event_msg_default_cost(PG* pg, queue_scrub_event_msg(pg, with_priority, cost); } -int64_t OSDService::get_scrub_cost() -{ - - int64_t cost_for_queue = cct->_conf->osd_scrub_cost; - if (op_queue_type_t::mClockScheduler == osd->osd_op_queue_type()) { - cost_for_queue = cct->_conf->osd_scrub_event_cost * - cct->_conf->osd_shallow_scrub_chunk_max; - } - return cost_for_queue; -} - void OSDService::queue_for_scrub(PG* pg, Scrub::scrub_prio_t with_priority) { queue_scrub_event_msg_default_cost(pg, with_priority); diff --git a/src/osd/OSD.h b/src/osd/OSD.h index cfdfeda1239..820024f779a 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -600,8 +600,6 @@ private: Scrub::scrub_prio_t with_priority, unsigned int qu_priority, Scrub::act_token_t act_token); - int64_t get_scrub_cost(); - utime_t defer_recovery_until; uint64_t recovery_ops_active; uint64_t recovery_ops_reserved;