]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: use recovery sleep hdd for ssd store and hdd journal case 16614/head
authorNeha Ojha <nojha@redhat.com>
Fri, 4 Aug 2017 18:07:19 +0000 (11:07 -0700)
committerNeha Ojha <nojha@redhat.com>
Fri, 4 Aug 2017 18:07:19 +0000 (11:07 -0700)
Signed-off-by: Neha Ojha <nojha@redhat.com>
src/osd/OSD.cc

index c9702c4577f4af57b02dbbb028cc4619758066af..26fdc69bd5f90da2d7f75c02952375ce35a772d1 100644 (file)
@@ -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()