From 11575832a37ea247a8febe912b3058f51a464ab6 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Wed, 6 May 2015 10:50:19 -0700 Subject: [PATCH] OSD: add recovery_wq suicide timeout Signed-off-by: Samuel Just (cherry picked from commit 85311b656852af75bfbbc6699f92fc6aa233c316) Conflicts: src/common/config_opts.h There was a merge conflict due to introduction of `osd_recovery_sleep` which was introduced in #3829 --- src/common/config_opts.h | 1 + src/osd/OSD.cc | 6 +++++- src/osd/OSD.h | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/common/config_opts.h b/src/common/config_opts.h index 06be0f55038a2..5602a1beeff68 100644 --- a/src/common/config_opts.h +++ b/src/common/config_opts.h @@ -566,6 +566,7 @@ OPTION(osd_backfill_scan_max, OPT_INT, 512) OPTION(osd_op_thread_timeout, OPT_INT, 15) OPTION(osd_op_thread_suicide_timeout, OPT_INT, 150) OPTION(osd_recovery_thread_timeout, OPT_INT, 30) +OPTION(osd_recovery_thread_suicide_timeout, OPT_INT, 300) OPTION(osd_snap_trim_thread_timeout, OPT_INT, 60*60*1) OPTION(osd_snap_trim_sleep, OPT_FLOAT, 0) OPTION(osd_scrub_thread_timeout, OPT_INT, 60) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 3a58b9196bd0d..82b356b5f8741 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -1567,7 +1567,11 @@ OSD::OSD(CephContext *cct_, ObjectStore *store_, pg_stat_tid(0), pg_stat_tid_flushed(0), command_wq(this, cct->_conf->osd_command_thread_timeout, &command_tp), recovery_ops_active(0), - recovery_wq(this, cct->_conf->osd_recovery_thread_timeout, &recovery_tp), + recovery_wq( + this, + cct->_conf->osd_recovery_thread_timeout, + cct->_conf->osd_recovery_thread_suicide_timeout, + &recovery_tp), replay_queue_lock("OSD::replay_queue_lock"), snap_trim_wq(this, cct->_conf->osd_snap_trim_thread_timeout, &disk_tp), scrub_wq(this, cct->_conf->osd_scrub_thread_timeout, &disk_tp), diff --git a/src/osd/OSD.h b/src/osd/OSD.h index ac7f2ce213ea3..9bad7e2a3725d 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -1998,8 +1998,8 @@ protected: struct RecoveryWQ : public ThreadPool::WorkQueue { OSD *osd; - RecoveryWQ(OSD *o, time_t ti, ThreadPool *tp) - : ThreadPool::WorkQueue("OSD::RecoveryWQ", ti, ti*10, tp), osd(o) {} + RecoveryWQ(OSD *o, time_t ti, time_t si, ThreadPool *tp) + : ThreadPool::WorkQueue("OSD::RecoveryWQ", ti, si, tp), osd(o) {} bool _empty() { return osd->recovery_queue.empty(); -- 2.39.5