osd: change scrub min/max thresholds

The previous 'osd scrub min interval' was mostly meaningless and useless.
Meanwhile, the 'osd scrub max interval' would only trigger a scrub if the
load was sufficiently low; if it was high, the PG might *never* scrub.

Instead, make the 'min' what the max used to be.  If it has been more than
this many seconds, and the load is low, scrub.  And add an additional
condition that if it has been more than the max threshold, scrub the PG
no matter what--regardless of the load.

Note that this does not change the default scrub interval for less-loaded
clusters, but it *does* change the meaning of existing config options.

Fixes: #3786
Signed-off-by: Sage Weil <sage@inktank.com>

1 files changed, 11 insertions, 0 deletions

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index e69de29bb2d..0f1f761b9f3 100644
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -0,0 +1,11 @@
+
+
+* The meaning of 'osd scrub max interval' has been changed: it is now
+  the amount of time after which a PG will be scrubbed regardless of
+  the system load.  The option 'osd scrub min interval' now has the
+  previous meaning: the amount of time before a PG is scrubbed if the
+  load is low.  The defaults have been adjusted such that the only
+  change in behavior is that PGs will now be scrubbed after a week
+  even if the system load remains high.  However, if either of these
+  options have been changed in ceph.conf, those settings should be
+  reviewed in light of their adjusted meanings.
\ No newline at end of file