dulcy: switch to postgresql 12

[chef.git] / cookbooks / nominatim / templates / default / updater.erb

diff --git a/cookbooks/nominatim/templates/default/updater.erb b/cookbooks/nominatim/templates/default/updater.erb
index 8a3cf027edf4f2549a835e300d8e5d566afc8c49..ade5845aa6fda850f5d16801cef83c1afb012d3e 100644 (file)
--- a/cookbooks/nominatim/templates/default/updater.erb
+++ b/cookbooks/nominatim/templates/default/updater.erb
@@ -5,14 +5,26 @@
 # Change to Nominatim directory
 cd <%= @bindir %>
 
 # Change to Nominatim directory
 cd <%= @bindir %>
 

+num_cpus=`cat /proc/cpuinfo | grep -c processor`
+num_cpus=$((num_cpus - 2))
+

 while [ ! -f "<%= @update_stop_file %>" ]
 do
     # Send output to the log (logrotatable)
     exec >> <%= @logfile %> 2>&1
 while [ ! -f "<%= @update_stop_file %>" ]
 do
     # Send output to the log (logrotatable)
     exec >> <%= @logfile %> 2>&1

-    starttime=`date +%s`

 
 

-    ./utils/update.php --no-npi --import-osmosis
+    current_load=`cat /proc/loadavg | cut -f 2 -d ' ' | sed 's:\..*::'`

 
 

+    if [[ $current_load -lt $num_cpus ]]
+    then
+        INST=2
+    else
+        INST=1
+    fi
+
+    ./utils/update.php --import-osmosis --index-instances $INST
+
+<% if node[:nominatim][:enable_git_updates] -%>

     pushd <%= @srcdir %>
     if git fetch origin; then
       # will trigger recompilation if necessary
     pushd <%= @srcdir %>
     if git fetch origin; then
       # will trigger recompilation if necessary


@@ -21,14 +33,10 @@ do
       echo "WARNING: git fetch failed."
     fi
     popd
       echo "WARNING: git fetch failed."
     fi
     popd

+<% end -%>

 
 

-    # sleep a bit if updates take less than a minute
-    endtime=`date +%s`
-    elapsed=$((endtime - starttime))
-    if [[ $elapsed -lt 60 ]]
-    then
-        sleepy=$((60 - $elapsed))
-        echo "Sleeping for ${sleepy}s..."
-        sleep $sleepy
+    if [ -f "<%= @update_maintenance_trigger %>" ]; then
+        rm <%= @update_maintenance_trigger %>
+        ./utils/update.php --calculate-postcodes

     fi
 done
     fi
 done