X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/7aa1c692da44b5441554522d486e01aa02b27c3a..bf61eba8aa8b8c8069d874cde29736cbac0c4f1f:/roles/nominatim.rb diff --git a/roles/nominatim.rb b/roles/nominatim.rb index ccb9cf0d5..a98fd9f25 100644 --- a/roles/nominatim.rb +++ b/roles/nominatim.rb @@ -17,15 +17,12 @@ default_attributes( :timeout => 60, :keepalive => false, :event => { - :max_clients => 560, - :threads_per_child => 35 + :server_limit => 32, + :max_clients => 1600, + :threads_per_child => 50 } }, - :apt => { - :sources => [ "ubuntugis-stable", "ubuntugis-unstable" ] - }, :postgresql => { - :versions => [ "9.1" ], :settings => { :defaults => { :max_connections => "450", @@ -41,27 +38,27 @@ default_attributes( :postgres => { :comment => "Increase shared memory for postgres", :parameters => { - "kernel.shmmax" => 16 * 1024 * 1024 * 1024, - "kernel.shmall" => 16 * 1024 * 1024 * 1024 / 4096 + "kernel.shmmax" => 26 * 1024 * 1024 * 1024, + "kernel.shmall" => 26 * 1024 * 1024 * 1024 / 4096 + } + }, + :kernel_scheduler_tune => { + :comment => "Tune kernel scheduler preempt", + :parameters => { + "kernel.sched_min_granularity_ns" => 10000000, + "kernel.sched_wakeup_granularity_ns" => 15000000 + } + }, + :swappiness => { + :comment => "Reduce swap usage", + :parameters => { + "vm.swappiness" => 10 } } }, :nominatim => { - :repository => "git://git.openstreetmap.org/nominatim.git", - :database => { - :cluster => "9.1/main", - :dbname => "nominatim" - }, - :fpm_pools => { - :www => { - :pm => "dynamic", - :max_children => "50" - }, - :bulk => { - :pm => "static", - :max_children => "7" - } - } + :enabled => true, + :repository => "git://git.openstreetmap.org/nominatim.git" } )