From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 28 Jun 2020 16:06:06 +0000 (+0200)
Subject: disable JIT and parallel processing for osm2pgsql in updates
X-Git-Tag: v3.5.1~3
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/670cff0d09b3d9568e86c4e753c33532177b2d81

disable JIT and parallel processing for osm2pgsql in updates

This is known to cause issues because of bad indexing
statistics.
---

diff --git a/utils/update.php b/utils/update.php
index d03cbed6..9bb3388a 100644
--- a/utils/update.php
+++ b/utils/update.php
@@ -55,6 +55,7 @@ date_default_timezone_set('Etc/UTC');
 
 $oDB = new Nominatim\DB();
 $oDB->connect();
+$fPostgresVersion = $oDB->getPostgresVersion();
 
 $aDSNInfo = Nominatim\DB::parseDSN(CONST_Database_DSN);
 if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432;
@@ -90,6 +91,10 @@ if (isset($aDSNInfo['password']) && $aDSNInfo['password']) {
 if (!is_null(CONST_Osm2pgsql_Flatnode_File) && CONST_Osm2pgsql_Flatnode_File) {
     $oOsm2pgsqlCmd->addParams('--flat-nodes', CONST_Osm2pgsql_Flatnode_File);
 }
+if ($fPostgresVersion >= 11.0) {
+    $oOsm2pgsqlCmd->addEnvPair('PGOPTIONS',
+                               '-c jit=off -c max_parallel_workers_per_gather=0');
+}
 
 
 $oIndexCmd = (new \Nominatim\Shell(CONST_BasePath.'/nominatim/nominatim.py'))