From: Neha Ojha <nojha@redhat.com>
Date: Fri, 28 Jun 2019 16:53:01 +0000 (-0700)
Subject: common/options.cc, doc: osd_snap_trim_sleep overrides other variants
X-Git-Tag: v14.2.3~16^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F29678%2Fhead;p=ceph.git

common/options.cc, doc: osd_snap_trim_sleep overrides other variants

A value > 0 for osd_snap_trim_sleep, will override the backend specific
variants of osd_snap_trim_sleep.

Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 733df09fe5111e7beca75f8be0afb8669ef9a625)
---

diff --git a/doc/rados/configuration/osd-config-ref.rst b/doc/rados/configuration/osd-config-ref.rst
index 0530010c910f..200cd52b6f44 100644
--- a/doc/rados/configuration/osd-config-ref.rst
+++ b/doc/rados/configuration/osd-config-ref.rst
@@ -473,6 +473,7 @@ Operations
 
 :Description: Time in seconds to sleep before next snap trim op.
               Increasing this value will slow down snap trimming.
+              This option overrides backend specific variants.
 
 :Type: Float
 :Default: ``0``
diff --git a/src/common/options.cc b/src/common/options.cc
index 16fb1144c36d..2ce73b5e3c7e 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -3305,7 +3305,7 @@ std::vector<Option> get_global_options() {
 
     Option("osd_snap_trim_sleep", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
     .set_default(0)
-    .set_description("Time in seconds to sleep before next snap trim"),
+    .set_description("Time in seconds to sleep before next snap trim (overrides values below)"),
 
     Option("osd_snap_trim_sleep_hdd", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
     .set_default(5)