From: Samuel Just Date: Thu, 14 Jan 2016 16:35:23 +0000 (-0800) Subject: config_opts: increase suicide timeout to 300 to match recovery X-Git-Tag: v0.94.6~8^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F7236%2Fhead;p=ceph.git config_opts: increase suicide timeout to 300 to match recovery Fixes: 14376 Backport: hammer, firefly Signed-off-by: Samuel Just --- diff --git a/src/common/config_opts.h b/src/common/config_opts.h index f2b16c58bcb7..2f8e1fd62c3b 100644 --- a/src/common/config_opts.h +++ b/src/common/config_opts.h @@ -578,7 +578,7 @@ 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_thread_suicide_timeout, OPT_INT, 60) +OPTION(osd_scrub_thread_suicide_timeout, OPT_INT, 300) OPTION(osd_scrub_finalize_thread_timeout, OPT_INT, 60*10) OPTION(osd_scrub_invalid_stats, OPT_BOOL, true) OPTION(osd_remove_thread_timeout, OPT_INT, 60*60)