From: David Zafman <dzafman@redhat.com>
Date: Fri, 8 Feb 2019 01:13:05 +0000 (-0800)
Subject: doc: Update some of the priority item descriptions
X-Git-Tag: v12.2.13~154^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=010ac7f38e681a55f6fa49ba5cfc6242e3c485e9;p=ceph.git

doc: Update some of the priority item descriptions

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit b1efd4309634839693cb3d323318777a4fb57258)
(cherry picked from commit 7d4bfea0018ce811d0c5794f271f7bf76bb7b648)
---

diff --git a/doc/rados/configuration/osd-config-ref.rst b/doc/rados/configuration/osd-config-ref.rst
index 1af802da2d4..1f6eabb64e2 100644
--- a/doc/rados/configuration/osd-config-ref.rst
+++ b/doc/rados/configuration/osd-config-ref.rst
@@ -401,8 +401,7 @@ recovery operations to ensure optimal performance during recovery.
 
 ``osd client op priority``
 
-:Description: The priority set for client operations. It is relative to
-              ``osd recovery op priority``.
+:Description: The priority set for client operations.
 
 :Type: 32-bit Integer
 :Default: ``63``
@@ -421,18 +420,30 @@ recovery operations to ensure optimal performance during recovery.
 
 ``osd scrub priority``
 
-:Description: The priority set for scrub operations. It is relative to
-              ``osd client op priority``.
+:Description: The default priority set for a scheduled scrub work queue when the
+              pool doesn't specify a value of ``scrub_priority``.  This can be
+              boosted to the value of ``osd client op priority`` when scrub is
+              blocking client operations.
 
 :Type: 32-bit Integer
 :Default: ``5``
 :Valid Range: 1-63
 
 
+``osd requested scrub priority``
+
+:Description: The priority set for user requested scrub on the work queue.  If
+              this value were to be smaller than ``osd client op priority`` it
+              can be boosted to the value of ``osd client op priority`` when
+              scrub is blocking client operations.
+
+:Type: 32-bit Integer
+:Default: ``120``
+
+
 ``osd snap trim priority``
 
-:Description: The priority set for snap trim operations. It is relative to
-              ``osd client op priority``.
+:Description: The priority set for the snap trim work queue.
 
 :Type: 32-bit Integer
 :Default: ``5``