doc: clarify osd recovery op priority and fix a couple of typos

Signed-off-by: Anthony D'Atri <anthony.datri@gmail.com>

diff --git a/doc/dev/osd_internals/backfill_reservation.rst b/doc/dev/osd_internals/backfill_reservation.rst
index 95526236ab369ebecf3cd9117bcfc2032287d46d..3c380dcf6025fbf5b920d58b7e9e71a5fe5d17a3 100644 (file)
--- a/doc/dev/osd_internals/backfill_reservation.rst
+++ b/doc/dev/osd_internals/backfill_reservation.rst
@@ -39,7 +39,7 @@ which PGs are recovered.  Admins can override the default order by using
 ``force-recovery`` or ``force-backfill``. A ``force-recovery`` with op
 priority ``255`` will start before a ``force-backfill`` op at priority ``254``.
 
-If a recovery is needed because a PG is below ``min_size`` a base priority of
+If recovery is needed because a PG is below ``min_size`` a base priority of
 ``220`` is used. This is incremented by the number of OSDs short of the pool's
 ``min_size`` as well as a value relative to the pool's ``recovery_priority``.
 The resultant priority is capped at ``253`` so that it does not confound forced
@@ -47,11 +47,12 @@ ops as described above. Under ordinary circumstances a recovery op is
 prioritized at ``180`` plus a value relative to the pool's ``recovery_priority``.
 The resultant priority is capped at ``219``.
 
-If a backfill op is needed because the number of acting OSDs is less than
+If backfill is needed because the number of acting OSDs is less than
 the pool's ``min_size``, a priority of ``220`` is used.  The number of OSDs
-short of the pool's `` min_size`` is added as well as a value relative to
+short of the pool's ``min_size`` is added as well as a value relative to
 the pool's ``recovery_priority``.  The total priority is limited to ``253``.
-If a backfill op is needed because a PG is undersized,
+
+If backfill is needed because a PG is undersized,
 a priority of ``140`` is used.  The number of OSDs below the size of the pool is
 added as well as a value relative to the pool's ``recovery_priority``.  The
 resultant priority is capped at ``179``.  If a backfill op is

diff --git a/doc/rados/configuration/osd-config-ref.rst b/doc/rados/configuration/osd-config-ref.rst
index e185139ced649a9538b79f82ab9958aa4aa68ced..dad65bc1154511af353ec417ee4da1e6bea5ec49 100644 (file)
--- a/doc/rados/configuration/osd-config-ref.rst
+++ b/doc/rados/configuration/osd-config-ref.rst
@@ -433,7 +433,9 @@ Operations
 
 ``osd client op priority``
 
-:Description: The priority set for client operations.
+:Description: The priority set for client operations.  This value is relative
+              to that of ``osd recovery op priority`` below.  The default
+              strongly favors client ops over recovery.
 
 :Type: 32-bit Integer
 :Default: ``63``
@@ -442,7 +444,12 @@ Operations
 
 ``osd recovery op priority``
 
-:Description: The priority set for recovery operations, if not specified by the pool's ``recovery_op_priority``.
+:Description: The priority of recovery operations vs client operations, if not specified by the
+              pool's ``recovery_op_priority``.  The default value prioritizes client
+              ops (see above) over recovery ops.  You may adjust the tradeoff of client
+              impact against the time to restore cluster health by lowering this value
+              for increased prioritization of client ops, or by increasing it to favor
+              recovery.
 
 :Type: 32-bit Integer
 :Default: ``3``