]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: Avoid osd_recovery_sleep cause recovery-thread suicide. 7065/head
authorJianpeng Ma <jianpeng.ma@intel.com>
Tue, 29 Dec 2015 09:16:33 +0000 (17:16 +0800)
committerJianpeng Ma <jianpeng.ma@intel.com>
Tue, 29 Dec 2015 09:16:33 +0000 (17:16 +0800)
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
src/osd/OSD.cc

index 4a212d470ac8c8421d6875617f717324274526f6..2e97428dd0ce5e8cb66092fa20bbd4925223d36e 100644 (file)
@@ -7922,9 +7922,11 @@ bool OSD::_recover_now()
 void OSD::do_recovery(PG *pg, ThreadPool::TPHandle &handle)
 {
   if (g_conf->osd_recovery_sleep > 0) {
+    handle.suspend_tp_timeout();
     utime_t t;
     t.set_from_double(g_conf->osd_recovery_sleep);
     t.sleep();
+    handle.reset_tp_timeout();
     dout(20) << __func__ << " slept for " << t << dendl;
   }