From: Jianpeng Ma <jianpeng.ma@intel.com>
Date: Tue, 22 Dec 2015 15:11:21 +0000 (+0800)
Subject: osd: Avoid osd_op_thread suicide because osd_scrub_sleep >
X-Git-Tag: v10.0.3~149^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eace76d96ce65388b32a9431f2ec02d477f4ce97;p=ceph.git

osd: Avoid osd_op_thread suicide because osd_scrub_sleep >
tp_suicide_timeout.

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index f3f7b1295d45..0f249409c977 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -3851,7 +3851,9 @@ void PG::scrub(epoch_t queued, ThreadPool::TPHandle &handle)
     unlock();
     utime_t t;
     t.set_from_double(g_conf->osd_scrub_sleep);
+    handle.suspend_tp_timeout();
     t.sleep();
+    handle.reset_tp_timeout();
     lock();
     dout(20) << __func__ << " slept for " << t << dendl;
   }