Set reasonable PostgreSQL GUCs for tile servers

These are based off of the osm2pgsql.org recommendations, scaled
for the larger servers we run, as well as experience running
PostgreSQL in a large variety of environments.

diff --git a/roles/balerion.rb b/roles/balerion.rb
index ee5ca2be40e9eaca3f49b309de930dcd72fc99d1..cfbc82ec6f6c86c88f01e1f3acf1df7f43f0d9d1 100644 (file)
--- a/roles/balerion.rb
+++ b/roles/balerion.rb
@@ -21,8 +21,6 @@ default_attributes(
   :postgresql => {
     :settings => {
       :defaults => {
   :postgresql => {
     :settings => {
       :defaults => {

-        :shared_buffers => "8GB",
-        :maintenance_work_mem => "7144MB",

         :effective_cache_size => "16GB"
       }
     }
         :effective_cache_size => "16GB"
       }
     }

diff --git a/roles/bowser.rb b/roles/bowser.rb
index a12c9887e06dd0e6081c3460c465d11f4233be52..26e8d2d4f96b4f2525ebefe61c97c7d77222629f 100644 (file)
--- a/roles/bowser.rb
+++ b/roles/bowser.rb
@@ -21,8 +21,6 @@ default_attributes(
   :postgresql => {
     :settings => {
       :defaults => {
   :postgresql => {
     :settings => {
       :defaults => {

-        :shared_buffers => "8GB",
-        :maintenance_work_mem => "7144MB",

         :effective_cache_size => "16GB"
       }
     }
         :effective_cache_size => "16GB"
       }
     }

diff --git a/roles/culebre.rb b/roles/culebre.rb
index c956e456c93958393aea30a4de278f2f33b369f3..9058b44459fe31b29b858e23a8a9d4d6a58f46c9 100644 (file)
--- a/roles/culebre.rb
+++ b/roles/culebre.rb
@@ -32,8 +32,6 @@ default_attributes(
   :postgresql => {
     :settings => {
       :defaults => {
   :postgresql => {
     :settings => {
       :defaults => {

-        :shared_buffers => "8GB",
-        :maintenance_work_mem => "7144MB",

         :effective_cache_size => "16GB"
       }
     }
         :effective_cache_size => "16GB"
       }
     }

diff --git a/roles/nidhogg.rb b/roles/nidhogg.rb
index 19535d2de6c46d9e33a79cdb0f6117731bd92950..8b6003c8e9ce85c2ccf9bf0deb23e040de32fba8 100644 (file)
--- a/roles/nidhogg.rb
+++ b/roles/nidhogg.rb
@@ -29,8 +29,6 @@ default_attributes(
   :postgresql => {
     :settings => {
       :defaults => {
   :postgresql => {
     :settings => {
       :defaults => {

-        :shared_buffers => "8GB",
-        :maintenance_work_mem => "7144MB",

         :effective_cache_size => "16GB"
       }
     }
         :effective_cache_size => "16GB"
       }
     }

diff --git a/roles/odin.rb b/roles/odin.rb
index 14b1f768e0ec66e5d5f22d8c77ca536c95231b84..79514889c630e92595ea7d6cf4008ae2f9361ee9 100644 (file)
--- a/roles/odin.rb
+++ b/roles/odin.rb
@@ -32,8 +32,6 @@ default_attributes(
   :postgresql => {
     :settings => {
       :defaults => {
   :postgresql => {
     :settings => {
       :defaults => {

-        :shared_buffers => "8GB",
-        :maintenance_work_mem => "7144MB",

         :effective_cache_size => "16GB"
       }
     }
         :effective_cache_size => "16GB"
       }
     }

diff --git a/roles/palulukon.rb b/roles/palulukon.rb
index 0a1adf68f2d87c96f14ea1fde94ebe7240d4c0eb..fb0612be7b8b058ff6fc624e48a651896e3405d3 100644 (file)
--- a/roles/palulukon.rb
+++ b/roles/palulukon.rb
@@ -22,8 +22,6 @@ default_attributes(
   :postgresql => {
     :settings => {
       :defaults => {
   :postgresql => {
     :settings => {
       :defaults => {

-        :shared_buffers => "8GB",
-        :maintenance_work_mem => "7144MB",

         :effective_cache_size => "16GB"
       }
     }
         :effective_cache_size => "16GB"
       }
     }

diff --git a/roles/piasa.rb b/roles/piasa.rb
index 35f28a2061a7b5fac5113a7f35419cda3313351d..4b0bd0b28d08e882722c2d30fce1c3a752c5f1fe 100644 (file)
--- a/roles/piasa.rb
+++ b/roles/piasa.rb
@@ -22,8 +22,6 @@ default_attributes(
   :postgresql => {
     :settings => {
       :defaults => {
   :postgresql => {
     :settings => {
       :defaults => {

-        :shared_buffers => "8GB",
-        :maintenance_work_mem => "7144MB",

         :effective_cache_size => "16GB"
       }
     }
         :effective_cache_size => "16GB"
       }
     }

diff --git a/roles/pyrene.rb b/roles/pyrene.rb
index 1b211f033b5088ca5526eea6db32ca18576d1898..9d943e24361561b162b17965553956812dd1b4e9 100644 (file)
--- a/roles/pyrene.rb
+++ b/roles/pyrene.rb
@@ -37,8 +37,6 @@ default_attributes(
   :postgresql => {
     :settings => {
       :defaults => {
   :postgresql => {
     :settings => {
       :defaults => {

-        :shared_buffers => "8GB",
-        :maintenance_work_mem => "7144MB",

         :effective_cache_size => "16GB"
       }
     }
         :effective_cache_size => "16GB"
       }
     }

diff --git a/roles/tile.rb b/roles/tile.rb
index 6bb3dc9023f340283e70f1fc77e14d50a3562743..88a971145373651c786a6eaba5f75ae0e833e064 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -34,14 +34,16 @@ default_attributes(
     :settings => {
       :defaults => {
         :max_connections => "250",
     :settings => {
       :defaults => {
         :max_connections => "250",

-        :temp_buffers => "32MB",
+        :shared_buffers => "16GB",

         :work_mem => "128MB",
         :work_mem => "128MB",

+        :maintenance_work_mem => "8GB",

         :max_parallel_workers_per_gather => "0",
         :wal_level => "minimal",
         :wal_buffers => "1024kB",
         :wal_writer_delay => "500ms",
         :max_parallel_workers_per_gather => "0",
         :wal_level => "minimal",
         :wal_buffers => "1024kB",
         :wal_writer_delay => "500ms",

+        :checkpoint_timeout => "60min"

         :commit_delay => "10000",
         :commit_delay => "10000",

-        :max_wal_size => "2880MB",
+        :max_wal_size => "10GB",

         :max_wal_senders => "0",
         :jit => "off",
         :track_activity_query_size => "16384",
         :max_wal_senders => "0",
         :jit => "off",
         :track_activity_query_size => "16384",

diff --git a/roles/ysera.rb b/roles/ysera.rb
index f00192ac062a675781620987f4839159f5074d71..980b5da421133c117237ca352023e29a2e9e847f 100644 (file)
--- a/roles/ysera.rb
+++ b/roles/ysera.rb
@@ -23,8 +23,6 @@ default_attributes(
   :postgresql => {
     :settings => {
       :defaults => {
   :postgresql => {
     :settings => {
       :defaults => {

-        :shared_buffers => "8GB",
-        :maintenance_work_mem => "7144MB",

         :effective_cache_size => "16GB"
       }
     }
         :effective_cache_size => "16GB"
       }
     }