X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/fd5b662ae1ccede11c2f5eb67253f8cd3ae8a507..1613ad2ccaf85558a7fdcc3021992ad4d1734fc2:/roles/nominatim.rb

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index d640ec5f0..44ab24155 100644
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -17,8 +17,9 @@ default_attributes(
     :timeout => 60,
     :keepalive => false,
     :event => {
-      :max_clients => 560,
-      :threads_per_child => 35
+      :server_limit => 32,
+      :max_clients => 800,
+      :threads_per_child => 50
     }
   },
   :apt => {
@@ -41,8 +42,15 @@ 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
       }
     }
   },
@@ -51,16 +59,6 @@ default_attributes(
     :database => {
         :cluster => "9.1/main",
         :dbname => "nominatim"
-    },
-    :fpm_pools => {
-        :www => {
-            :pm => "dynamic",
-            :max_children => "25"
-        },
-        :bulk => {
-            :pm => "static",
-            :max_children => "7"
-        }
     }
   }
 )