]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
config_opts: increase suicide timeout to 300 to match recovery 7236/head
authorSamuel Just <sjust@redhat.com>
Thu, 14 Jan 2016 16:35:23 +0000 (08:35 -0800)
committerSamuel Just <sjust@redhat.com>
Thu, 14 Jan 2016 17:09:40 +0000 (09:09 -0800)
Fixes: 14376
Backport: hammer, firefly
Signed-off-by: Samuel Just <sjust@redhat.com>
src/common/config_opts.h

index f2b16c58bcb739d545bf04bf56d31c42b68541a9..2f8e1fd62c3b36666a769b6e734b0aca621b3f5e 100644 (file)
@@ -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)