From: Anthony D'Atri <anthony.datri@gmail.com>
Date: Tue, 17 Sep 2019 23:33:44 +0000 (-0700)
Subject: Change osd op queue cut off default to high
X-Git-Tag: v12.2.14~1^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b87a7c7ab3e2c960484e74300c9bdbe74b9ba8d1;p=ceph.git

Change osd op queue cut off default to high

Discussion: https://www.mail-archive.com/ceph-users@ceph.io/msg00166.html

Signed-off-by: Anthony D'Atri <anthony.datri@gmail.com>
(cherry picked from commit be4582c26a82ff9d6b82ff6178cd78223715bba9)
---

diff --git a/doc/rados/configuration/osd-config-ref.rst b/doc/rados/configuration/osd-config-ref.rst
index 7ecb6a7224703..588f459944145 100644
--- a/doc/rados/configuration/osd-config-ref.rst
+++ b/doc/rados/configuration/osd-config-ref.rst
@@ -395,7 +395,7 @@ recovery operations to ensure optimal performance during recovery.
 
 :Type: String
 :Valid Choices: prio, wpq, mclock_opclass, mclock_client
-:Default: ``prio``
+:Default: ``wpq``
 
 
 ``osd op queue cut off``
@@ -412,7 +412,7 @@ recovery operations to ensure optimal performance during recovery.
 
 :Type: String
 :Valid Choices: low, high
-:Default: ``low``
+:Default: ``high``
 
 
 ``osd client op priority``
diff --git a/src/common/options.cc b/src/common/options.cc
index a772ec02332dd..4a2d9554431ca 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -2053,7 +2053,7 @@ std::vector<Option> get_global_options() {
     .add_see_also("osd_op_queue_cut_off"),
 
     Option("osd_op_queue_cut_off", Option::TYPE_STR, Option::LEVEL_ADVANCED)
-    .set_default("low")
+    .set_default("high")
     .set_enum_allowed( { "low", "high", "debug_random" } )
     .set_description("the threshold between high priority ops and low priority ops")
     .set_long_description("the threshold between high priority ops that use strict priority ordering and low priority ops that use a fairness algorithm that may or may not incorporate priority")