From: Sage Weil Date: Fri, 9 Dec 2016 01:25:06 +0000 (-0600) Subject: osd: default osd_scrub_during_recovery=false X-Git-Tag: v11.1.1~88^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8dca17c067b51050308c5f1cb5eddd400fd6f3f0;p=ceph.git 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 --- diff --git a/doc/release-notes.rst b/doc/release-notes.rst index e99478d63b508..ee6e17d6a86b5 100644 --- 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 8045b6d35a82f..be19ec68984f2 100644 --- 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)