From bd500e31ea2b824b9f87a2b760b820e7e9d9b2eb Mon Sep 17 00:00:00 2001 From: Dongsheng Yang Date: Thu, 28 Apr 2016 04:52:07 -0400 Subject: [PATCH] ShardedOpWQ: make timeout when calling WaitInterval configurable Signed-off-by: Dongsheng Yang --- src/osd/OSD.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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()) { -- 2.47.3