From 6225dc532401d762c78b4b296c8c0720913142bd Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Sat, 27 May 2017 15:49:33 +0200 Subject: [PATCH] nominatim: adapt updates to current load --- cookbooks/nominatim/templates/default/updater.erb | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/cookbooks/nominatim/templates/default/updater.erb b/cookbooks/nominatim/templates/default/updater.erb index bf9a00101..8345205cb 100644 --- a/cookbooks/nominatim/templates/default/updater.erb +++ b/cookbooks/nominatim/templates/default/updater.erb @@ -5,13 +5,25 @@ # 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 --no-npi --import-osmosis --index-instances $INST <% if node[:nominatim][:enable_git_updates] -%> pushd <%= @srcdir %> -- 2.43.2