From c06e9bbb2936f3121000a54a95ce3b176df67f2d Mon Sep 17 00:00:00 2001 From: ialex Date: Wed, 4 Oct 2023 16:05:56 +0300 Subject: [PATCH] temporarily increase query timeout to avoid failing planet import during database warmup --- 4.3/init.sh | 7 +++++++ 4.3/start.sh | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/4.3/init.sh b/4.3/init.sh index ea75df89..2fde6e05 100755 --- a/4.3/init.sh +++ b/4.3/init.sh @@ -106,11 +106,18 @@ else fi fi +export NOMINATIM_QUERY_TIMEOUT=600 +export NOMINATIM_REQUEST_TIMEOUT=3600 if [ "$REVERSE_ONLY" = "true" ]; then + # --search-only is a workaround until https://github.com/osm-search/Nominatim/issues/3213 + # is merged and a new Nominatim version (probably 4.3.1) is released. + # Afterwards, we should revert back to using --reverse instead sudo -H -E -u nominatim nominatim admin --warm --search-only else sudo -H -E -u nominatim nominatim admin --warm fi +export NOMINATIM_QUERY_TIMEOUT=10 +export NOMINATIM_REQUEST_TIMEOUT=60 # gather statistics for query planner to potentially improve query performance # see, https://github.com/osm-search/Nominatim/issues/1023 diff --git a/4.3/start.sh b/4.3/start.sh index 32e3719a..cec4f342 100755 --- a/4.3/start.sh +++ b/4.3/start.sh @@ -59,6 +59,8 @@ fi tail -Fv /var/log/postgresql/postgresql-14-main.log /var/log/apache2/access.log /var/log/apache2/error.log /var/log/replication.log & tailpid=${!} +export NOMINATIM_QUERY_TIMEOUT=600 +export NOMINATIM_REQUEST_TIMEOUT=3600 if [ "$REVERSE_ONLY" = "true" ]; then echo "Warm database caches for reverse queries" # --search-only is a workaround until https://github.com/osm-search/Nominatim/issues/3213 @@ -69,6 +71,8 @@ else echo "Warm database caches for search and reverse queries" sudo -H -E -u nominatim nominatim admin --warm > /dev/null fi +export NOMINATIM_QUERY_TIMEOUT=10 +export NOMINATIM_REQUEST_TIMEOUT=60 echo "Warming finished" echo "--> Nominatim is ready to accept requests"