mirror of
https://github.com/ceph/ceph
synced 2025-01-19 01:21:49 +00:00
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 <amathuri@redhat.com>
This commit is contained in:
parent
34bed3e36a
commit
56c681c39a
@ -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
|
||||
|
@ -1984,7 +1984,6 @@ private:
|
||||
void maybe_override_sleep_options_for_qos();
|
||||
bool maybe_override_options_for_qos(
|
||||
const std::set<std::string> *changed = nullptr);
|
||||
void maybe_override_cost_for_qos();
|
||||
int run_osd_bench_test(int64_t count,
|
||||
int64_t bsize,
|
||||
int64_t osize,
|
||||
|
Loading…
Reference in New Issue
Block a user