diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | manager/knot_resolver_manager/kresd_controller/supervisord/supervisord.conf.j2 | 7 | ||||
| -rw-r--r-- | systemd/knot-resolver.service.in | 2 |
3 files changed, 8 insertions, 3 deletions
@@ -6,7 +6,7 @@ Improvements - manager: clear the cache via management HTTP API (#876,!1491) - docs: documentation is now separated into user and developer parts (!1514) - daemon: ignore UDP requests from ports < 1024 (!1507) -- manager: increase startup timeout for processes (!1518) +- manager: increase startup timeout for processes (!1518, !1520) - local-data: increase default DB size to 2G on 64-bit platforms (!1518) Bugfixes diff --git a/manager/knot_resolver_manager/kresd_controller/supervisord/supervisord.conf.j2 b/manager/knot_resolver_manager/kresd_controller/supervisord/supervisord.conf.j2 index c4dccecb..dcbb645d 100644 --- a/manager/knot_resolver_manager/kresd_controller/supervisord/supervisord.conf.j2 +++ b/manager/knot_resolver_manager/kresd_controller/supervisord/supervisord.conf.j2 @@ -47,7 +47,12 @@ stopsignal=SIGINT killasgroup=true autorestart=true autostart=true -startsecs=10 +{# Note that during startup, + manager will signal being ready only after sequential startup of all kresd workers, + i.e. it might take lots of time currently, if the user configured very large rulesets (e.g. huge RPZ). + Let's permit it lots of time, assuming that useful work is being done. +#} +startsecs=600 environment={{ manager.environment }},KRES_SUPRESS_LOG_PREFIX=true stdout_logfile=NONE stderr_logfile=NONE diff --git a/systemd/knot-resolver.service.in b/systemd/knot-resolver.service.in index c1277534..4cf544ad 100644 --- a/systemd/knot-resolver.service.in +++ b/systemd/knot-resolver.service.in @@ -8,7 +8,7 @@ Wants=nss-lookup.target [Service] Type=notify -TimeoutStartSec=10s +TimeoutStartSec=600s ExecStart=@bin_dir@/knot-resolver --config=@etc_dir@/config.yaml Environment=KRES_LOGGING_TARGET=syslog ExecReload=@bin_dir@/kresctl --config=@etc_dir@/config.yaml reload |