diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 46e8eb5e351..19db3f35cd6 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -4071,7 +4071,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); @@ -10222,15 +10218,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 6aface4b3ee..11c1d32a622 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -1984,7 +1984,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,