Merge remote-tracking branch 'github/pull/710'

[chef.git] / roles / nominatim.rb

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index 8981e500ae71aa036bf960222c6582d777716807..fca0d8ee0a29d035fda6a9efbbabb2c83f2f7a3a 100644 (file)
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -21,13 +21,18 @@ default_attributes(
       :defaults => {
         :max_connections => "450",
         :synchronous_commit => "off",
       :defaults => {
         :max_connections => "450",
         :synchronous_commit => "off",

-        :checkpoint_segments => "32",

         :checkpoint_timeout => "10min",
         :checkpoint_completion_target => "0.9",
         :jit => "off",
         :shared_buffers => "2GB",
         :autovacuum_max_workers => "1",
         :checkpoint_timeout => "10min",
         :checkpoint_completion_target => "0.9",
         :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",
+        :seq_page_cost => "3.0",
+        :random_page_cost => "3.0",
+        :effective_cache_size => "60GB",
+        :wal_level => "minimal",
+        :max_wal_senders => "0"

       }
     }
   },
       }
     }
   },


@@ -39,13 +44,6 @@ default_attributes(
         "kernel.shmall" => 26 * 1024 * 1024 * 1024 / 4096
       }
     },
         "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 => {
     :swappiness => {
       :comment => "Reduce swap usage",
       :parameters => {


@@ -64,6 +62,9 @@ default_attributes(
         "net.netfilter.nf_conntrack_max" => "196608"
       }
     }
         "net.netfilter.nf_conntrack_max" => "196608"
       }
     }

+  },
+  :nominatim => {
+    :dbadmins => %w[lonvia tomh]

   }
 )
 
   }
 )