Increase MinSpareThreads for planet servers

[chef.git] / roles / tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index 9849fed4bff6e2f8679eaa426282df68823f71a7..4d226961a1a064e5271f5c21e10ee8e65b6dee74 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -15,11 +15,20 @@ default_attributes(
     :timeout => 60,
     :event => {
       :server_limit => 60,
     :timeout => 60,
     :event => {
       :server_limit => 60,

-      :max_clients => 1200,
+      :max_request_workers => 1200,

       :threads_per_child => 20,
       :min_spare_threads => 30,
       :max_spare_threads => 180,
       :threads_per_child => 20,
       :min_spare_threads => 30,
       :max_spare_threads => 180,

-      :max_requests_per_child => 100000
+      :max_connections_per_child => 100000
+    }
+  },
+  :munin => {
+    :plugins => {
+      :renderd_processed => {
+        :graph_order => "reqPrio req reqLow dirty reqBulk dropped",
+        :reqPrio => { :draw => "AREA" },
+        :req => { :draw => "STACK" }
+      }

     }
   },
   :postgresql => {
     }
   },
   :postgresql => {


@@ -30,7 +39,9 @@ default_attributes(
         :wal_buffers => "1024kB",
         :wal_writer_delay => "500ms",
         :commit_delay => "10000",
         :wal_buffers => "1024kB",
         :wal_writer_delay => "500ms",
         :commit_delay => "10000",

-        :checkpoint_segments => "60"
+        :checkpoint_segments => "60",
+        :max_wal_size => "2880MB",
+        :track_activity_query_size => "16384"

       }
     }
   },
       }
     }
   },


@@ -78,7 +89,7 @@ default_attributes(
     :styles => {
       :default => {
         :repository => "git://github.com/gravitystorm/openstreetmap-carto.git",
     :styles => {
       :default => {
         :repository => "git://github.com/gravitystorm/openstreetmap-carto.git",

-        :revision => "v2.42.0",
+        :revision => "v2.44.0",

         :max_zoom => 19
       }
     }
         :max_zoom => 19
       }
     }