From: Nathan Cutler <ncutler@suse.com>
Date: Sun, 6 Sep 2015 14:30:35 +0000 (+0200)
Subject: OSD: add scrub_finalize_wq suicide timeout
X-Git-Tag: v0.80.11~2^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bff2f477c4ad86b4bd6e3ca3e637a6168c5c8053;p=ceph.git

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 98768ed6815..863f4637bf6 100644
--- 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 db99ca3a288..c7fffb9ad3a 100644
--- 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 158d19e4589..d06f0e7be6a 100644
--- 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();