X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/88f31b1c16467e5d939dc662936216783e5395b3..9e3d6bc2332036591015cf6171a685536e26b3c1:/roles/nominatim.rb?ds=sidebyside

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index 93d917e7b..fca0d8ee0 100644
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -21,7 +21,6 @@ default_attributes(
       :defaults => {
         :max_connections => "450",
         :synchronous_commit => "off",
-        :checkpoint_segments => "32",
         :checkpoint_timeout => "10min",
         :checkpoint_completion_target => "0.9",
         :jit => "off",
@@ -29,8 +28,11 @@ default_attributes(
         :autovacuum_max_workers => "1",
         :max_parallel_workers_per_gather => "0",
         :maintenance_work_mem => "10GB",
-        :random_page_cost => "1.5",
-        :effective_cache_size => "60GB"
+        :seq_page_cost => "3.0",
+        :random_page_cost => "3.0",
+        :effective_cache_size => "60GB",
+        :wal_level => "minimal",
+        :max_wal_senders => "0"
       }
     }
   },
@@ -42,13 +44,6 @@ default_attributes(
         "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 => {
@@ -69,19 +64,7 @@ default_attributes(
     }
   },
   :nominatim => {
-    :dbadmins => %w[lonvia tomh],
-    :tablespaces => {
-      "dosm" => "/ssd/tablespaces/dosm",
-      "iosm" => "/ssd/tablespaces/iosm",
-      "dplace" => "/ssd/tablespaces/dplace",
-      "iplace" => "/ssd/tablespaces/iplace",
-      "daddress" => "/ssd/tablespaces/daddress",
-      "iaddress" => "/ssd/tablespaces/iaddress",
-      "dsearch" => "/ssd/tablespaces/dsearch",
-      "isearch" => "/ssd/tablespaces/isearch",
-      "daux" => "/ssd/tablespaces/daux",
-      "iaux" => "/ssd/tablespaces/iaux"
-    }
+    :dbadmins => %w[lonvia tomh]
   }
 )