From 3cb152cbfc779ceac41b27e42533c9b5edc028b2 Mon Sep 17 00:00:00 2001 From: Neha Ojha Date: Fri, 28 Jun 2019 09:53:01 -0700 Subject: [PATCH] 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 (cherry picked from commit 733df09fe5111e7beca75f8be0afb8669ef9a625) --- doc/rados/configuration/osd-config-ref.rst | 1 + src/common/options.cc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/rados/configuration/osd-config-ref.rst b/doc/rados/configuration/osd-config-ref.rst index 193a0ba56a4..0d10bff3776 100644 --- 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 648fc5837dd..2c4da4011c0 100644 --- a/src/common/options.cc +++ b/src/common/options.cc @@ -2872,7 +2872,7 @@ std::vector