From: John Wilkins <john.wilkins@inktank.com>
Date: Mon, 2 Dec 2013 23:26:19 +0000 (-0800)
Subject: doc: Updated scrub defaults and added note about deep scrubbing.
X-Git-Tag: v0.74~42
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a5eda4fcc34461dbc0fcc47448f8456097de15eb;p=ceph.git

doc: Updated scrub defaults and added note about deep scrubbing.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
---

diff --git a/doc/rados/configuration/osd-config-ref.rst b/doc/rados/configuration/osd-config-ref.rst
index 597cec8ec9d..bc3471d1282 100644
--- a/doc/rados/configuration/osd-config-ref.rst
+++ b/doc/rados/configuration/osd-config-ref.rst
@@ -89,6 +89,8 @@ that Ceph uses the entire partition for the journal.
 :Type: String
 :Default: ``$libdir/rados-classes``
 
+
+
 .. index:: OSD; journal settings
 
 Journal Settings
@@ -222,7 +224,7 @@ scrubbing operations.
               when the Ceph Storage Cluster load is low.
 
 :Type: Float
-:Default: 5 minutes. ``300`` 
+:Default: Once per day. ``60*60*24``
 
 
 ``osd scrub max interval`` 
@@ -231,12 +233,14 @@ scrubbing operations.
               irrespective of cluster load.
 
 :Type: Float
-:Default: Once per day. ``60*60*24`` 
+:Default: Once per week. ``7*60*60*24``
 
 
 ``osd deep scrub interval``
 
-:Description: The interval for "deep" scrubbing (fully reading all data).
+:Description: The interval for "deep" scrubbing (fully reading all data). The 
+              ``osd scrub load threshold`` does not affect this setting.
+
 :Type: Float
 :Default: Once per week.  ``60*60*24*7``
 
@@ -244,7 +248,7 @@ scrubbing operations.
 ``osd deep scrub stride``
 
 :Description: Read size when doing a deep scrub.
-:Type: 32-bit Int
+:Type: 32-bit Integer
 :Default: 512 KB. ``524288``
 
 
@@ -436,6 +440,8 @@ Ceph performs well as the OSD map grows larger.
 :Type: 32-bit Integer
 :Default: ``100``
 
+
+
 .. index:: OSD; recovery
 
 Recovery