nominatim: adapt updates to current load

diff --git a/cookbooks/nominatim/templates/default/updater.erb b/cookbooks/nominatim/templates/default/updater.erb
index bf9a001013884305f39fe46fd9bbec6f6c809c16..8345205cb74099bf3baae9b42cdf8717efa4aed0 100644 (file)
--- a/cookbooks/nominatim/templates/default/updater.erb
+++ b/cookbooks/nominatim/templates/default/updater.erb
@@ -5,13 +5,25 @@
 # 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
     starttime=`date +%s`
 
 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 --no-npi --import-osmosis --index-instances $INST

 
 <% if node[:nominatim][:enable_git_updates] -%>
     pushd <%= @srcdir %>
 
 <% if node[:nominatim][:enable_git_updates] -%>
     pushd <%= @srcdir %>