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 7ecb6a722470305539dd5faeb154cd7056720aa9..588f459944145d5de702d8af385ef66d687f24ad 100644 (file)
--- 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 a772ec02332ddf735201aba1fbae9fb41a556c6f..4a2d9554431ca4c440fe5e0b187aff49bd3d947b 100644 (file)
--- 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")