From a3db28a973410d86fe1b419da60e222fb8ea6eb3 Mon Sep 17 00:00:00 2001 From: Aishwarya Mathuria Date: Fri, 9 Feb 2024 07:01:35 +0000 Subject: [PATCH] osd: Remove check on osd_pg_delete_cost change With the new cost estimation technique, we don't need osd_pg_delete_cost to be hard-coded to one particular value. Hence we can now remove the check we had previously added to prevent users from modifying deletion cost with mClock. Signed-off-by: Aishwarya Mathuria (cherry picked from commit 56c681c39a35686368e43e3baabcc7e7c5bd8b72) --- src/osd/OSD.cc | 13 ------------- src/osd/OSD.h | 1 - 2 files changed, 14 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index b0a6fc9241b..1098e4c66ac 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -4073,7 +4073,6 @@ int OSD::init() // Override a few options if mclock scheduler is enabled. maybe_override_sleep_options_for_qos(); - maybe_override_cost_for_qos(); maybe_override_options_for_qos(); maybe_override_max_osd_capacity_for_qos(); @@ -9886,9 +9885,6 @@ void OSD::handle_conf_change(const ConfigProxy& conf, changed.count("osd_recovery_sleep_hybrid")) { maybe_override_sleep_options_for_qos(); } - if (changed.count("osd_pg_delete_cost")) { - maybe_override_cost_for_qos(); - } if (changed.count("osd_min_recovery_priority")) { service.local_reserver.set_min_priority(cct->_conf->osd_min_recovery_priority); service.remote_reserver.set_min_priority(cct->_conf->osd_min_recovery_priority); @@ -10225,15 +10221,6 @@ void OSD::maybe_override_sleep_options_for_qos() } } -void OSD::maybe_override_cost_for_qos() -{ - // If the scheduler enabled is mclock, override the default PG deletion cost - // so that mclock can meet the QoS goals. - if (op_queue_type_t::mClockScheduler == osd_op_queue_type()) { - uint64_t pg_delete_cost = 1048576; - cct->_conf.set_val("osd_pg_delete_cost", std::to_string(pg_delete_cost)); - } -} /** * A context for receiving status from a background mon command to set diff --git a/src/osd/OSD.h b/src/osd/OSD.h index 5909ad246f7..b294aba7e0f 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -1994,7 +1994,6 @@ private: void maybe_override_sleep_options_for_qos(); bool maybe_override_options_for_qos( const std::set *changed = nullptr); - void maybe_override_cost_for_qos(); int run_osd_bench_test(int64_t count, int64_t bsize, int64_t osize, -- 2.39.5