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 193a0ba56a4da2f43e30ed380cad34e7c11641c3..0d10bff3776176aa6b293b58a464fe85f3510ba6 100644 (file)
--- a/doc/rados/configuration/osd-config-ref.rst
+++ b/doc/rados/configuration/osd-config-ref.rst
@@ -457,6 +457,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 648fc5837ddad9da36537348e4c3af6dbf2ce61f..2c4da4011c0d1b9244d7a5e00b79ae299f0d4a2d 100644 (file)
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -2872,7 +2872,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)