Merge pull request #7009 from majianpeng/osd-scrub-sleep-cause-thread…

…-suicide osd: avoid osd_op_thread suicide because osd_scrub_sleep Reviewed-by: Sage Weil <sage@redhat.com>
ceph · Jan 3, 2016 · 62c584f · 62c584f
2 parents d5ad57c + eace76d
commit 62c584f
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/osd/PG.cc b/src/osd/PG.cc
@@ -3852,7 +3852,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;
   }