Skip to content

Commit 56c681c

Browse files
committed
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 <[email protected]>
1 parent 34bed3e commit 56c681c

File tree

2 files changed

+0
-14
lines changed

2 files changed

+0
-14
lines changed

src/osd/OSD.cc

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4071,7 +4071,6 @@ int OSD::init()
40714071

40724072
// Override a few options if mclock scheduler is enabled.
40734073
maybe_override_sleep_options_for_qos();
4074-
maybe_override_cost_for_qos();
40754074
maybe_override_options_for_qos();
40764075
maybe_override_max_osd_capacity_for_qos();
40774076

@@ -9886,9 +9885,6 @@ void OSD::handle_conf_change(const ConfigProxy& conf,
98869885
changed.count("osd_recovery_sleep_hybrid")) {
98879886
maybe_override_sleep_options_for_qos();
98889887
}
9889-
if (changed.count("osd_pg_delete_cost")) {
9890-
maybe_override_cost_for_qos();
9891-
}
98929888
if (changed.count("osd_min_recovery_priority")) {
98939889
service.local_reserver.set_min_priority(cct->_conf->osd_min_recovery_priority);
98949890
service.remote_reserver.set_min_priority(cct->_conf->osd_min_recovery_priority);
@@ -10222,15 +10218,6 @@ void OSD::maybe_override_sleep_options_for_qos()
1022210218
}
1022310219
}
1022410220

10225-
void OSD::maybe_override_cost_for_qos()
10226-
{
10227-
// If the scheduler enabled is mclock, override the default PG deletion cost
10228-
// so that mclock can meet the QoS goals.
10229-
if (op_queue_type_t::mClockScheduler == osd_op_queue_type()) {
10230-
uint64_t pg_delete_cost = 1048576;
10231-
cct->_conf.set_val("osd_pg_delete_cost", std::to_string(pg_delete_cost));
10232-
}
10233-
}
1023410221

1023510222
/**
1023610223
* A context for receiving status from a background mon command to set

src/osd/OSD.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1984,7 +1984,6 @@ class OSD : public Dispatcher,
19841984
void maybe_override_sleep_options_for_qos();
19851985
bool maybe_override_options_for_qos(
19861986
const std::set<std::string> *changed = nullptr);
1987-
void maybe_override_cost_for_qos();
19881987
int run_osd_bench_test(int64_t count,
19891988
int64_t bsize,
19901989
int64_t osize,

0 commit comments

Comments
 (0)