X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/76212535d5c3bd8a789a1c8e1fe237710b169e59..e906958d96d6c220dbf126a66e8e573153f2ea2e:/roles/tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index 03ed0e9b0..56f6fe958 100644
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -4,8 +4,9 @@ description "Role applied to all tile servers"
 default_attributes(
   :accounts => {
     :users => {
+      :pnorman => { :status => :administrator },
       :tile => {
-        :members => [:jburgess, :tomh]
+        :members => [:jburgess, :tomh, :pnorman]
       }
     }
   },
@@ -13,7 +14,7 @@ default_attributes(
     :mpm => "event",
     :timeout => 60,
     :event => {
-      :server_limit => 60,
+      :server_limit => 80,
       :max_request_workers => 1200,
       :threads_per_child => 20,
       :min_spare_threads => 300,
@@ -38,12 +39,14 @@ default_attributes(
         :max_connections => "250",
         :temp_buffers => "32MB",
         :work_mem => "128MB",
+        :max_parallel_workers_per_gather => "0",
         :wal_buffers => "1024kB",
         :wal_writer_delay => "500ms",
         :commit_delay => "10000",
         :checkpoint_segments => "60",
         :max_wal_size => "2880MB",
         :random_page_cost => "1.1",
+        :jit => "off",
         :track_activity_query_size => "16384",
         :autovacuum_vacuum_scale_factor => "0.05",
         :autovacuum_analyze_scale_factor => "0.02"
@@ -60,53 +63,50 @@ default_attributes(
         "net.core.somaxconn" => 10000
       }
     },
-    :kernel_scheduler_tune => {
-      :comment => "Tune kernel scheduler preempt",
+    :network_conntrack_time_wait => {
+      :comment => "Only track completed connections for 30 seconds",
       :parameters => {
-        "kernel.sched_min_granularity_ns" => 10000000,
-        "kernel.sched_wakeup_granularity_ns" => 15000000
+        "net.netfilter.nf_conntrack_tcp_timeout_time_wait" => "30"
+      }
+    },
+    :network_conntrack_max => {
+      :comment => "Increase max number of connections tracked",
+      :parameters => {
+        "net.netfilter.nf_conntrack_max" => "524288"
+      }
+    },
+    :no_tcp_slow_start => {
+      :comment => "Disable TCP slow start",
+      :parameters => {
+        "net.ipv4.tcp_slow_start_after_idle" => "0"
+      }
+    },
+    :tcp_use_bbr => {
+      :comment => "Use TCP BBR Congestion Control",
+      :parameters => {
+        "net.core.default_qdisc" => "fq",
+        "net.ipv4.tcp_congestion_control" => "bbr"
       }
     }
   },
   :tile => {
     :database => {
       :style_file => "/srv/tile.openstreetmap.org/styles/default/openstreetmap-carto.style",
-      :tag_transform_script => "/srv/tile.openstreetmap.org/styles/default/openstreetmap-carto.lua"
-    },
-    :data => {
-      :simplified_land_polygons => {
-        :url => "https://osmdata.openstreetmap.de/download/simplified-land-polygons-complete-3857.zip",
-        :refresh => true
-      },
-      :simplified_water_polygons => {
-        :url => "https://osmdata.openstreetmap.de/download/simplified-water-polygons-split-3857.zip",
-        :refresh => true
-      },
-      :admin_boundaries => {
-        :url => "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_boundary_lines_land.zip",
-        :directory => "ne_110m_admin_0_boundary_lines_land"
-      },
-      :land_polygons => {
-        :url => "https://osmdata.openstreetmap.de/download/land-polygons-split-3857.zip",
-        :refresh => true
-      },
-      :water_polygons => {
-        :url => "https://osmdata.openstreetmap.de/download/water-polygons-split-3857.zip",
-        :refresh => true
-      },
-      :antarctica_icesheet_polygons => {
-        :url => "https://osmdata.openstreetmap.de/download/antarctica-icesheet-polygons-3857.zip",
-        :refresh => true
-      },
-      :antarctica_icesheet_outlines => {
-        :url => "https://osmdata.openstreetmap.de/download/antarctica-icesheet-outlines-3857.zip",
-        :refresh => true
-      }
+      :tag_transform_script => "/srv/tile.openstreetmap.org/styles/default/openstreetmap-carto.lua",
+      :external_data_script => "/srv/tile.openstreetmap.org/styles/default/scripts/get-external-data.py -c /srv/tile.openstreetmap.org/styles/default/external-data.yml",
+      :external_data_tables => %w[
+        icesheet_outlines
+        icesheet_polygons
+        ne_110m_admin_0_boundary_lines_land
+        simplified_water_polygons
+        water_polygons
+      ]
     },
     :styles => {
       :default => {
         :repository => "https://github.com/gravitystorm/openstreetmap-carto.git",
-        :revision => "v4.25.0",
+        :revision => "v5.6.2",
+        :fonts_script => "/srv/tile.openstreetmap.org/styles/default/scripts/get-fonts.sh",
         :max_zoom => 19
       }
     }