Drop scheduler tuning that is not supported in newer kernels

[chef.git] / roles / nominatim.rb

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index 8981e500ae71aa036bf960222c6582d777716807..fd82954298a58f76de37e7e173513ec2118a3f8f 100644 (file)
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -27,7 +27,10 @@ default_attributes(
         :jit => "off",
         :shared_buffers => "2GB",
         :autovacuum_max_workers => "1",
-        :max_parallel_workers_per_gather => "0"
+        :max_parallel_workers_per_gather => "0",
+        :maintenance_work_mem => "10GB",
+        :random_page_cost => "1.5",
+        :effective_cache_size => "60GB"
       }
     }
   },
@@ -39,13 +42,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 => {
@@ -64,6 +60,21 @@ default_attributes(
         "net.netfilter.nf_conntrack_max" => "196608"
       }
     }
+  },
+  :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"
+    }
   }
 )