Permalink
Browse files

default thread_pool_watchdog == default cli_timeout

Avoid (potential) issues due to the monotonic clock not advancing for ~10
seconds such as for virtual machine snapshots or migrations.

In such a scenario, we would kill a child after cli_timeout anyway, so
using the same timeout by default for the watchdog also should reduce
the additional risk implied by it.

Ref	#2814
  • Loading branch information...
nigoroll committed Oct 9, 2018
1 parent 13015f5 commit dbc956693df2e8c45e2505330e2eeac681b5e6d2
Showing with 2 additions and 2 deletions.
  1. +1 −1 bin/varnishd/mgt/mgt_pool.c
  2. +1 −1 include/tbl/params.h
@@ -156,7 +156,7 @@ struct parspec WRK_parspec[] = {
"If no queued work have been released for this long,"
" the worker process panics itself.",
EXPERIMENTAL,
"10", "seconds" },
"60", "seconds" },
{ "thread_pool_destroy_delay",
tweak_timeout, &mgt_param.wthread_destroy_delay,
"0.01", NULL,
@@ -1202,7 +1202,7 @@ PARAM(
/* typ */ timeout,
/* min */ "0.1",
/* max */ NULL,
/* default */ "10.000",
/* default */ "60.000",
/* units */ "seconds",
/* flags */ EXPERIMENTAL,
/* s-text */

0 comments on commit dbc9566

Please sign in to comment.