From: Ronen Friedman <rfriedma@redhat.com>
Date: Mon, 22 May 2023 15:09:28 +0000 (+0300)
Subject: osd/scrub: increasing max_osd_scrubs to 3
X-Git-Tag: v17.2.8~479^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F55174%2Fhead;p=ceph.git

osd/scrub: increasing max_osd_scrubs to 3

Bug reports seem to hint that the current default value of
'1' is too low: the cluster is susceptible to scrub scheduling
delays and issues stemming from local software/networking/hardware
problems, even if affecting a very small number of OSDs.

Squid will include a major overhaul of the way scrubs are counted
in the cluster, providing a better solution to the problem. For
now - modifying the default is an effective stop-gap measure.

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
(cherry picked from commit cc7b4afda972c144d7ebc679ff7f42d86f1dc493)
---

diff --git a/src/common/options/osd.yaml.in b/src/common/options/osd.yaml.in
index ea91fc52091e9..3cee0b71e8035 100644
--- a/src/common/options/osd.yaml.in
+++ b/src/common/options/osd.yaml.in
@@ -170,7 +170,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