Base: switch to BBR for Congestion Control

[chef.git] / roles / base.rb

diff --git a/roles/base.rb b/roles/base.rb
index ca5956a7fe1e05cf9671b93c5064d2c328439a3c..bc08d820c4bd101c91ae3b1779e905d03ce44f6b 100644 (file)
--- a/roles/base.rb
+++ b/roles/base.rb
@@ -15,8 +15,8 @@ default_attributes(
   },
   :munin => {
     :plugins => {
-      :ntp_offset => {
-        :offset => { :warning => "100", :critical => "250" }
+      :chrony => {
+        :systime => { :warning => "100", :critical => "250" }
       }
     }
   },
@@ -46,12 +46,15 @@ default_attributes(
         "net.core.wmem_max" => "16777216",
         "net.ipv4.tcp_rmem" => "4096\t87380\t16777216",
         "net.ipv4.tcp_wmem" => "4096\t65536\t16777216",
-        "net.ipv4.udp_mem"  => "3145728\t4194304\t16777216"
+        "net.ipv4.udp_mem" => "3145728\t4194304\t16777216"
       }
     },
     :network_backlog => {
       :comment => "Increase maximum backlog for incoming network packets",
-      :parameters => { "net.core.netdev_max_backlog" => "2500" }
+      :parameters => {
+        "net.core.netdev_max_backlog" => "2500",
+        "net.core.netdev_budget" => "600"
+      }
     },
     :network_conntrack_established => {
       :comment => "Only track established connections for four hours",
@@ -66,18 +69,17 @@ default_attributes(
       }
     },
     :default_qdisc => {
-      :comment => "Use pfifo_fast as the default queuing discipline",
+      :comment => "Use fq as the default queuing discipline and bbr for congestion control",
       :parameters => {
-        "net.core.default_qdisc" => "pfifo_fast"
+        "net.core.default_qdisc" => "fq",
+        "net.ipv4.tcp_congestion_control" => "bbr"
       }
-    }
-  },
-  :sysfs => {
-    :cpufreq_ondemand => {
-      :comment => "Tune the ondemand CPU frequency governor",
+    },
+    :tune_cpu_scheduler => {
+      :comment => "Tune CPU scheduler for server scheduling",
       :parameters => {
-        "devices/system/cpu/cpufreq/ondemand/up_threshold" => "25",
-        "devices/system/cpu/cpufreq/ondemand/sampling_down_factor" => "100"
+        "kernel.sched_migration_cost_ns" => 50000000,
+        "kernel.sched_autogroup_enabled" => 0
       }
     }
   }