From 17d6a993fc17d533460c5f40f3908c708e057c18 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 23 May 2024 18:45:17 +0200 Subject: Merging upstream version 18.2.3. Signed-off-by: Daniel Baumann --- src/common/options/osd.yaml.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/common/options/osd.yaml.in') diff --git a/src/common/options/osd.yaml.in b/src/common/options/osd.yaml.in index 7291ce11d..a9596cec1 100644 --- a/src/common/options/osd.yaml.in +++ b/src/common/options/osd.yaml.in @@ -182,7 +182,7 @@ options: desc: Maximum concurrent scrubs on a single OSD fmt_desc: The maximum number of simultaneous scrub operations for a Ceph OSD Daemon. - default: 1 + default: 3 with_legacy: true - name: osd_scrub_during_recovery type: bool @@ -895,13 +895,13 @@ options: desc: Do not store full-object checksums if the backend (bluestore) does its own checksums. Only usable with all BlueStore OSDs. default: false -# PrioritzedQueue (prio), Weighted Priority Queue (wpq ; default), -# mclock_opclass, mclock_client, or debug_random. "mclock_opclass" -# and "mclock_client" are based on the mClock/dmClock algorithm -# (Gulati, et al. 2010). "mclock_opclass" prioritizes based on the -# class the operation belongs to. "mclock_client" does the same but -# also works to ienforce fairness between clients. "debug_random" -# chooses among all four with equal probability. +# Weighted Priority Queue (wpq), mClock Scheduler (mclock_scheduler: default) +# or debug_random. "mclock_scheduler" is based on the mClock/dmClock +# algorithm (Gulati, et al. 2010). "mclock_scheduler" prioritizes based on +# the class the operation belongs to. "wpq" dequeues ops based on their +# priorities. "debug_random" chooses among the two with equal probability. +# Note: PrioritzedQueue (prio) implementation is not used for scheduling ops +# within OSDs and is therefore not listed. - name: osd_op_queue type: str level: advanced -- cgit v1.2.3