X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/8c0c354ccdecd8772cb32087d2c666dcbc053fc1..027e6c6a30ad50302390f6ea56d3bbf7a49f4fdf:/cookbooks/nominatim/templates/default/updater.erb

diff --git a/cookbooks/nominatim/templates/default/updater.erb b/cookbooks/nominatim/templates/default/updater.erb
index bf9a00101..ade5845aa 100644
--- a/cookbooks/nominatim/templates/default/updater.erb
+++ b/cookbooks/nominatim/templates/default/updater.erb
@@ -5,13 +5,24 @@
 # 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
-    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 %>
@@ -24,13 +35,8 @@ do
     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