temporarily increase query timeout to avoid failing planet import dur…

…ing database warmup
mediagis · Oct 7, 2023 · c06e9bb · c06e9bb
1 parent b4ec7dd
commit c06e9bb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git 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
@@ -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"