osd: default osd_scrub_during_recovery=false

This is a more friendly behavior.  Tell users in the release notes how to
get the old behavior.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/doc/release-notes.rst b/doc/release-notes.rst
index e99478d63b508cb311834f4473ef2df571f796dc..ee6e17d6a86b5178e1416b0ad5aedb7cb5ab4807 100644 (file)
--- a/doc/release-notes.rst
+++ b/doc/release-notes.rst
@@ -101,6 +101,12 @@ Upgrading from Jewel
 Upgrading
 ---------
 
+* The OSDs now avoid starting new scrubs while recovery is in progress.  To
+  revert to the old behavior (and do not let recovery activity affect the
+  scrub scheduling) you can set the following option::
+
+    osd scrub during recovery = true
+
 * The list of monitor hosts/addresses for building the monmap can now be
   obtained from DNS SRV records. The service name used in when querying the DNS
   is defined in the "mon_dns_srv_name" config option, which defaults to

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 8045b6d35a82f712cef4ccbb103fe181dfffe540..be19ec68984f29c838763d879f4421fd193a9572 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -787,7 +787,7 @@ OPTION(osd_max_push_cost, OPT_U64, 8<<20)  // max size of push message
 OPTION(osd_max_push_objects, OPT_U64, 10)  // max objects in single push op
 OPTION(osd_recovery_forget_lost_objects, OPT_BOOL, false)   // off for now
 OPTION(osd_max_scrubs, OPT_INT, 1)
-OPTION(osd_scrub_during_recovery, OPT_BOOL, true) // Allow new scrubs to start while recovery is active on the OSD
+OPTION(osd_scrub_during_recovery, OPT_BOOL, false) // Allow new scrubs to start while recovery is active on the OSD
 OPTION(osd_scrub_begin_hour, OPT_INT, 0)
 OPTION(osd_scrub_end_hour, OPT_INT, 24)
 OPTION(osd_scrub_load_threshold, OPT_FLOAT, 0.5)