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 ea91fc52091e98858a558228cdc7f3e86e4a10c6..3cee0b71e803510c4d6b23a6ff02aba423463286 100644 (file)
--- 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