Tune connection tracking on tile servers

[chef.git] / roles / tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index 4a3189532e108e8ddee743d812a8a225e38902c0..1da7726d863ee13be19550b7fc87d03e19a82119 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -62,11 +62,16 @@ default_attributes(
         "net.core.somaxconn" => 10000
       }
     },
         "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 => {
       :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 => {
       }
     },
     :no_tcp_slow_start => {


@@ -81,7 +86,7 @@ default_attributes(
         "net.core.default_qdisc" => "fq",
         "net.ipv4.tcp_congestion_control" => "bbr"
       }
         "net.core.default_qdisc" => "fq",
         "net.ipv4.tcp_congestion_control" => "bbr"
       }

-    },
+    }

   },
   :tile => {
     :database => {
   },
   :tile => {
     :database => {


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

-        :revision => "v5.4.0",
+        :revision => "v5.5.1",

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