From: Neha Ojha <nojha@redhat.com>
Date: Fri, 4 Aug 2017 18:07:19 +0000 (-0700)
Subject: osd: use recovery sleep hdd for ssd store and hdd journal case
X-Git-Tag: v12.1.3~93^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=139cc382abf57a261cc850d05485205eb4344037;p=ceph.git

osd: use recovery sleep hdd for ssd store and hdd journal case

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index c9702c4577f4..26fdc69bd5f9 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -2357,12 +2357,12 @@ float OSD::get_osd_recovery_sleep()
 {
   if (cct->_conf->osd_recovery_sleep)
     return cct->_conf->osd_recovery_sleep;
-  if (store_is_rotational && journal_is_rotational)
-    return cct->_conf->osd_recovery_sleep_hdd;
+  if (!store_is_rotational && !journal_is_rotational)
+    return cct->_conf->osd_recovery_sleep_ssd;
   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;
+    return cct->_conf->osd_recovery_sleep_hdd;
 }
 
 int OSD::init()