From: Igor Fedotov <ifedotov@suse.com>
Date: Tue, 29 Sep 2020 17:37:33 +0000 (+0300)
Subject: osd: adjust osd_delete_sleep_ssd[_hybrid]
X-Git-Tag: v14.2.17~98^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=17e2d39ac6ebfd67c23cedf5df00fca4fe07f8fd;p=ceph.git

osd: adjust osd_delete_sleep_ssd[_hybrid]

1) Do not differentiate all-flash and hybrid(ssd+hdd) deployments since
they both bound to SSD drive backing DB volume.
2) Drop osd_delete_sleep_hybrid from 2s to 1s
3) Raise osd_delete_sleep_ssd to 1s since 0 is a way too low - having
it that low tend to cause a significant negative imact on OSD's regular
operation.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 6e09f0c13a74d6d38522866875a83c6ee505cfa7)
---

diff --git a/src/common/options.cc b/src/common/options.cc
index c3ce70ecf860..d921bf1c8aa6 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -3883,11 +3883,11 @@ std::vector<Option> get_global_options() {
     .set_description("Time in seconds to sleep before next removal transaction for HDDs"),
 
     Option("osd_delete_sleep_ssd", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
-    .set_default(0)
+    .set_default(1)
     .set_description("Time in seconds to sleep before next removal transaction for SSDs"),
 
     Option("osd_delete_sleep_hybrid", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
-    .set_default(2)
+    .set_default(1)
     .set_description("Time in seconds to sleep before next removal transaction when data is on HDD and journal is on SSD"),
 
     Option("osd_failsafe_full_ratio", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)