manager, systemd: increase startup timeout for manager (again)

During the previous increase I didn't realize the comment added now.

diff --git a/NEWS b/NEWS
index e433fc8d8cbc0303995a685990d26996f20315a7..6d108713e56cbc714db6468584a7aaf21850768f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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 c4dccecb8966b9c6c97abc496a94a9b7b2d0f5cb..dcbb645d9e8e9ce1ff3e933ca9bd0e91e831a5fc 100644 (file)
--- 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 c12775347a10c22dc32197f8aa49300e157854a9..4cf544ad2fcdacb20ece69e4c82bc4eb936f4988 100644 (file)
--- 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