From: Jianpeng Ma <jianpeng.ma@intel.com>
Date: Tue, 29 Dec 2015 09:16:33 +0000 (+0800)
Subject: osd: Avoid osd_recovery_sleep cause recovery-thread suicide.
X-Git-Tag: v10.0.3~129^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1e120c88d85aceccfbaadb4474d8533256dbadb2;p=ceph.git

osd: Avoid osd_recovery_sleep cause recovery-thread suicide.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 4a212d470ac8..2e97428dd0ce 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -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;
   }