From: Satoru Takeuchi Date: Thu, 12 Dec 2024 00:40:41 +0000 (+0000) Subject: common/options: fix the description of osd_max_scrubs X-Git-Tag: v19.2.3~253^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=96006e96c45080c63be06c15c5566a98bc56610f;p=ceph.git common/options: fix the description of osd_max_scrubs osd_max_scrubs takes effect even though mclock is used. ``` $ ceph config show-with-defaults osd.0 | grep '^osd_max_scrubs' | sed -E -e 's/( +)/ /g' osd_max_scrubs 3 default $ ceph config show-with-defaults osd.0 | grep '^osd.* override ' | sed -E -e 's/( +)/ /g' osd_delete_sleep 0.000000 override osd_delete_sleep_hdd 0.000000 override osd_delete_sleep_hybrid 0.000000 override osd_delete_sleep_ssd 0.000000 override osd_pg_delete_cost 15728640 override osd_recovery_sleep 0.000000 override osd_recovery_sleep_hdd 0.000000 override osd_recovery_sleep_hybrid 0.000000 override osd_recovery_sleep_ssd 0.000000 override osd_scrub_sleep 0.000000 override osd_snap_trim_sleep 0.000000 override osd_snap_trim_sleep_hdd 0.000000 override osd_snap_trim_sleep_hybrid 0.000000 override osd_snap_trim_sleep_ssd 0.000000 override ``` Signed-off-by: Satoru Takeuchi (cherry picked from commit 153639ca7f47e58b00377d86ba6baadc45431a48) --- diff --git a/src/common/options/osd.yaml.in b/src/common/options/osd.yaml.in index cd6221f0cb585..4b3dfd02b22c5 100644 --- a/src/common/options/osd.yaml.in +++ b/src/common/options/osd.yaml.in @@ -193,7 +193,6 @@ options: desc: Maximum concurrent scrubs on a single OSD fmt_desc: The maximum number of simultaneous scrub operations for a Ceph OSD Daemon. - note: This setting is ignored when the mClock scheduler is used. default: 3 with_legacy: true - name: osd_scrub_during_recovery