OSD: add scrub_finalize_wq suicide timeout

Signed-off-by: Nathan Cutler <ncutler@suse.com>

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 98768ed6815847ec12a4bacfdd60a8f6de155b91..863f4637bf6fa3e035e89e8dad7a8225e27ea681 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -485,6 +485,7 @@ OPTION(osd_snap_trim_sleep, OPT_FLOAT, 0)
 OPTION(osd_scrub_thread_timeout, OPT_INT, 60)
 OPTION(osd_scrub_thread_suicide_timeout, OPT_INT, 60)
 OPTION(osd_scrub_finalize_thread_timeout, OPT_INT, 60*10)
+OPTION(osd_scrub_finalize_thread_suicide_timeout, OPT_INT, 60*10*10)
 OPTION(osd_scrub_invalid_stats, OPT_BOOL, true)
 OPTION(osd_remove_thread_timeout, OPT_INT, 60*60)
 OPTION(osd_remove_thread_suicide_timeout, OPT_INT, 10*60*60)

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index db99ca3a28853484acd05b4975f45142ec94b299..c7fffb9ad3a9a49fe4f896cf94d8f21cdf989892 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -983,7 +983,10 @@ OSD::OSD(CephContext *cct_, ObjectStore *store_,
     cct->_conf->osd_scrub_thread_timeout,
     cct->_conf->osd_scrub_thread_suicide_timeout,
     &disk_tp),
-  scrub_finalize_wq(cct->_conf->osd_scrub_finalize_thread_timeout, &op_tp),
+  scrub_finalize_wq(
+    cct->_conf->osd_scrub_finalize_thread_timeout, 
+    cct->_conf->osd_scrub_finalize_thread_suicide_timeout, 
+    &op_tp),
   rep_scrub_wq(
     this,
     cct->_conf->osd_scrub_thread_timeout,

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 158d19e458946f66fd82c580c43dd83454ef7abb..d06f0e7be6ade4787cc85109bdc279560647d5e1 100644 (file)
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -1802,8 +1802,8 @@ protected:
     xlist<PG*> scrub_finalize_queue;
 
   public:
-    ScrubFinalizeWQ(time_t ti, ThreadPool *tp)
-      : ThreadPool::WorkQueue<PG>("OSD::ScrubFinalizeWQ", ti, ti*10, tp) {}
+    ScrubFinalizeWQ(time_t ti, time_t si, ThreadPool *tp)
+      : ThreadPool::WorkQueue<PG>("OSD::ScrubFinalizeWQ", ti, si, tp) {}
 
     bool _empty() {
       return scrub_finalize_queue.empty();