From: Neha Ojha <nojha@redhat.com>
Date: Tue, 1 Aug 2017 19:36:55 +0000 (-0700)
Subject: osd: Add recovery sleep hybrid configuration option
X-Git-Tag: v12.1.3~93^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=59dad1ced77c505f8ef8b4e628d2fbd06abf3612;p=ceph.git

osd: Add recovery sleep hybrid configuration option

Signed-off-by: Neha Ojha <nojha@redhat.com>
---

diff --git a/src/common/options.cc b/src/common/options.cc
index 4d6bbd1c17f5..3edce44b7c59 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -1985,15 +1985,19 @@ std::vector<Option> get_global_options() {
 
     Option("osd_recovery_sleep", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
     .set_default(0)
-    .set_description(""),
+    .set_description("Time in seconds to sleep before next recovery or backfill op"),
 
     Option("osd_recovery_sleep_hdd", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
     .set_default(0.1)
-    .set_description(""),
+    .set_description("Time in seconds to sleep before next recovery or backfill op for HDDs"),
 
     Option("osd_recovery_sleep_ssd", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
     .set_default(0)
-    .set_description(""),
+    .set_description("Time in seconds to sleep before next recovery or backfill op for SSDs"),
+
+    Option("osd_recovery_sleep_hybrid", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
+    .set_default(0.025)
+    .set_description("Time in seconds to sleep before next recovery or backfill op when data is on HDD and journal is on SSD"),
 
     Option("osd_snap_trim_sleep", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
     .set_default(0)
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index dd96a5b6cba3..c9702c4577f4 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -2357,8 +2357,10 @@ float OSD::get_osd_recovery_sleep()
 {
   if (cct->_conf->osd_recovery_sleep)
     return cct->_conf->osd_recovery_sleep;
-  if (store_is_rotational)
+  if (store_is_rotational && journal_is_rotational)
     return cct->_conf->osd_recovery_sleep_hdd;
+  else if (store_is_rotational && !journal_is_rotational)
+    return cct->_conf->get_val<double>("osd_recovery_sleep_hybrid");
   else
     return cct->_conf->osd_recovery_sleep_ssd;
 }