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 f3f7b1295d450133df2e734e6c6a0235a16f9319..0f249409c977fd3a8bccf22673b21045b99d9c29 100644 (file)
--- 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;
   }