From: Dongsheng Yang <dongsheng.yang@easystack.cn>
Date: Thu, 28 Apr 2016 08:52:07 +0000 (-0400)
Subject: ShardedOpWQ: make timeout when calling WaitInterval configurable
X-Git-Tag: v11.0.0~618^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bd500e31ea2b824b9f87a2b760b820e7e9d9b2eb;p=ceph.git

ShardedOpWQ: make timeout when calling WaitInterval configurable

Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 66aebb75e6bb..bd63de041b9c 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -8619,9 +8619,11 @@ void OSD::ShardedOpWQ::_process(uint32_t thread_index, heartbeat_handle_d *hb )
   sdata->sdata_op_ordering_lock.Lock();
   if (sdata->pqueue->empty()) {
     sdata->sdata_op_ordering_lock.Unlock();
-    osd->cct->get_heartbeat_map()->reset_timeout(hb, 4, 0);
+    osd->cct->get_heartbeat_map()->reset_timeout(hb,
+      osd->cct->_conf->threadpool_default_timeout, 0);
     sdata->sdata_lock.Lock();
-    sdata->sdata_cond.WaitInterval(osd->cct, sdata->sdata_lock, utime_t(2, 0));
+    sdata->sdata_cond.WaitInterval(osd->cct, sdata->sdata_lock,
+      utime_t(osd->cct->_conf->threadpool_empty_queue_max_wait, 0));
     sdata->sdata_lock.Unlock();
     sdata->sdata_op_ordering_lock.Lock();
     if(sdata->pqueue->empty()) {