doc: Document new pg state and changes to auto repair behavior

Fixes: http://tracker.ceph.com/issues/38616
Signed-off-by: David Zafman <dzafman@redhat.com>

diff --git a/doc/dev/placement-group.rst b/doc/dev/placement-group.rst
index 2994752f04bbb957cad63e6501e68bf02a14db18..e29be2fa69c8514979b6c90e0660e811bac426ad 100644 (file)
--- a/doc/dev/placement-group.rst
+++ b/doc/dev/placement-group.rst
@@ -186,6 +186,9 @@ User-visible PG States
 *forced_backfill*
   the PG has been marked for highest priority backfill
 
+*failed_repair*
+  an attempt to repair the PG has failed.  Manual intervention is required.
+
 
 OMAP STATISTICS
 ===============

diff --git a/doc/rados/configuration/osd-config-ref.rst b/doc/rados/configuration/osd-config-ref.rst
index 937c8b848a37d811272020ef21be9625f322441c..935f4075c1f4b36e425375a2439724192bf1f921 100644 (file)
--- a/doc/rados/configuration/osd-config-ref.rst
+++ b/doc/rados/configuration/osd-config-ref.rst
@@ -361,8 +361,8 @@ scrubbing operations.
 ``osd scrub auto repair``
 
 :Description: Setting this to ``true`` will enable automatic pg repair when errors
-              are found in deep-scrub.  However, if more than ``osd scrub auto repair num errors``
-              errors are found a repair is NOT performed.
+              are found in scrub or deep-scrub.  However, if more than
+              ``osd scrub auto repair num errors`` errors are found a repair is NOT performed.
 :Type: Boolean
 :Default: ``false``