From 6ad38a291dd1fffb5a8b9ad786dd7ca22f67f411 Mon Sep 17 00:00:00 2001 From: Sridhar Seshasayee Date: Fri, 14 May 2021 13:54:19 +0530 Subject: [PATCH] osd: Remove the generic "osd_mclock_max_capacity_iops" option. Remove the generic "osd_mclock_max_capacity_iops" option and use the "osd_mclock_max_capacity_iops_[hdd,ssd]" options. It is better to have a clear indication about the type of underlying device. This helps in avoiding confusion when trying to read or override the options. Signed-off-by: Sridhar Seshasayee --- src/common/options/osd.yaml.in | 13 ------------- src/osd/scheduler/mClockScheduler.cc | 17 +++++------------ 2 files changed, 5 insertions(+), 25 deletions(-) diff --git a/src/common/options/osd.yaml.in b/src/common/options/osd.yaml.in index c5f33fe1743..8faf09b3558 100644 --- a/src/common/options/osd.yaml.in +++ b/src/common/options/osd.yaml.in @@ -1019,19 +1019,6 @@ options: default: 0.011 flags: - runtime -- name: osd_mclock_max_capacity_iops - type: float - level: basic - desc: Max IOPs capacity (at 4KiB block size) to consider per OSD (overrides _ssd - and _hdd if non-zero) - long_desc: This option specifies the max osd capacity in iops per OSD. Helps in - QoS calculations when enabling a dmclock profile. Only considered for osd_op_queue - = mclock_scheduler - fmt_desc: Max IOPS capacity (at 4KiB block size) to consider per OSD - (overrides _ssd and _hdd if non-zero) - default: 0 - flags: - - runtime - name: osd_mclock_max_capacity_iops_hdd type: float level: basic diff --git a/src/osd/scheduler/mClockScheduler.cc b/src/osd/scheduler/mClockScheduler.cc index 470c943f4df..e34c4094e0c 100644 --- a/src/osd/scheduler/mClockScheduler.cc +++ b/src/osd/scheduler/mClockScheduler.cc @@ -99,17 +99,12 @@ const dmc::ClientInfo *mClockScheduler::ClientRegistry::get_info( void mClockScheduler::set_max_osd_capacity() { - if (cct->_conf.get_val("osd_mclock_max_capacity_iops")) { + if (is_rotational) { max_osd_capacity = - cct->_conf.get_val("osd_mclock_max_capacity_iops"); + cct->_conf.get_val("osd_mclock_max_capacity_iops_hdd"); } else { - if (is_rotational) { - max_osd_capacity = - cct->_conf.get_val("osd_mclock_max_capacity_iops_hdd"); - } else { - max_osd_capacity = - cct->_conf.get_val("osd_mclock_max_capacity_iops_ssd"); - } + max_osd_capacity = + cct->_conf.get_val("osd_mclock_max_capacity_iops_ssd"); } // Set per op-shard iops limit max_osd_capacity /= num_shards; @@ -447,7 +442,6 @@ const char** mClockScheduler::get_tracked_conf_keys() const "osd_mclock_cost_per_byte_usec", "osd_mclock_cost_per_byte_usec_hdd", "osd_mclock_cost_per_byte_usec_ssd", - "osd_mclock_max_capacity_iops", "osd_mclock_max_capacity_iops_hdd", "osd_mclock_max_capacity_iops_ssd", "osd_mclock_profile", @@ -470,8 +464,7 @@ void mClockScheduler::handle_conf_change( changed.count("osd_mclock_cost_per_byte_usec_ssd")) { set_osd_mclock_cost_per_byte(); } - if (changed.count("osd_mclock_max_capacity_iops") || - changed.count("osd_mclock_max_capacity_iops_hdd") || + if (changed.count("osd_mclock_max_capacity_iops_hdd") || changed.count("osd_mclock_max_capacity_iops_ssd")) { set_max_osd_capacity(); if (mclock_profile != "custom") { -- 2.39.5