From: Samuel Just <sjust@redhat.com>
Date: Wed, 6 May 2015 17:51:28 +0000 (-0700)
Subject: OSD: add snap_trim_wq suicide timeout
X-Git-Tag: v0.80.11~2^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6926a64fbd4718b8a5df8e04545bc93c4981e413;p=ceph.git

OSD: add snap_trim_wq suicide timeout

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit e1073a4a577211672148a4112bd633831552d66f)
---

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index de01d636bc0..ca849991f2b 100644
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -479,6 +479,7 @@ OPTION(osd_op_thread_timeout, OPT_INT, 15)
 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_thread_suicide_timeout, OPT_INT, 60*60*10)
 OPTION(osd_snap_trim_sleep, OPT_FLOAT, 0)
 OPTION(osd_scrub_thread_timeout, OPT_INT, 60)
 OPTION(osd_scrub_finalize_thread_timeout, OPT_INT, 60*10)
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 3b74e4cdc30..97ed2911a81 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -965,7 +965,11 @@ OSD::OSD(CephContext *cct_, ObjectStore *store_,
     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),
+  snap_trim_wq(
+    this,
+    cct->_conf->osd_snap_trim_thread_timeout,
+    cct->_conf->osd_snap_trim_thread_suicide_timeout,
+    &disk_tp),
   scrub_wq(this, cct->_conf->osd_scrub_thread_timeout, &disk_tp),
   scrub_finalize_wq(cct->_conf->osd_scrub_finalize_thread_timeout, &op_tp),
   rep_scrub_wq(this, cct->_conf->osd_scrub_thread_timeout, &disk_tp),
diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 0ec34771664..3ebf6549023 100644
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -1711,8 +1711,8 @@ protected:
   
   struct SnapTrimWQ : public ThreadPool::WorkQueue<PG> {
     OSD *osd;
-    SnapTrimWQ(OSD *o, time_t ti, ThreadPool *tp)
-      : ThreadPool::WorkQueue<PG>("OSD::SnapTrimWQ", ti, 0, tp), osd(o) {}
+    SnapTrimWQ(OSD *o, time_t ti, time_t si, ThreadPool *tp)
+      : ThreadPool::WorkQueue<PG>("OSD::SnapTrimWQ", ti, si, tp), osd(o) {}
 
     bool _empty() {
       return osd->snap_trim_queue.empty();