Skip to content

Commit d56f613

Browse files
committed
osd/scrub: additional configuration params to trigger scrub reschedule
Adding the following parameters to the (small) set of configuration options that, if changed, trigger re-computation of the next scrub schedule: - osd_scrub_interval_randomize_ratio, - osd_deep_scrub_interval_cv, and - osd_deep_scrub_interval (which was missing in the list of parameters watched by the OSD). Fixes: https://tracker.ceph.com/issues/70806 Signed-off-by: Ronen Friedman <[email protected]>
1 parent 1deacb7 commit d56f613

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

src/osd/OSD.cc

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10074,6 +10074,9 @@ std::vector<std::string> OSD::get_tracked_keys() const noexcept
1007410074
"osd_object_clean_region_max_num_intervals"s,
1007510075
"osd_scrub_min_interval"s,
1007610076
"osd_scrub_max_interval"s,
10077+
"osd_deep_scrub_interval"s,
10078+
"osd_deep_scrub_interval_cv"s,
10079+
"osd_scrub_interval_randomize_ratio"s,
1007710080
"osd_op_thread_timeout"s,
1007810081
"osd_op_thread_suicide_timeout"s,
1007910082
"osd_max_scrubs"s
@@ -10201,13 +10204,16 @@ void OSD::handle_conf_change(const ConfigProxy& conf,
1020110204

1020210205
if (changed.count("osd_scrub_min_interval") ||
1020310206
changed.count("osd_scrub_max_interval") ||
10204-
changed.count("osd_deep_scrub_interval")) {
10207+
changed.count("osd_deep_scrub_interval") ||
10208+
changed.count("osd_deep_scrub_interval_cv") ||
10209+
changed.count("osd_scrub_interval_randomize_ratio")) {
1020510210
service.get_scrub_services().on_config_change();
1020610211
dout(0) << fmt::format(
10207-
"{}: scrub interval change (min:{} deep:{} max:{})",
10212+
"{}: scrub interval change (min:{} deep:{} max:{} ratio:{})",
1020810213
__func__, cct->_conf->osd_scrub_min_interval,
1020910214
cct->_conf->osd_deep_scrub_interval,
10210-
cct->_conf->osd_scrub_max_interval)
10215+
cct->_conf->osd_scrub_max_interval,
10216+
cct->_conf->osd_scrub_interval_randomize_ratio)
1021110217
<< dendl;
1021210218
}
1021310219

0 commit comments

Comments
 (0)