Base: switch to BBR for Congestion Control

diff --git a/roles/base.rb b/roles/base.rb
index cad8821f7cec7533730807d89497d14a2310461f..bc08d820c4bd101c91ae3b1779e905d03ce44f6b 100644 (file)
--- a/roles/base.rb
+++ b/roles/base.rb
@@ -69,9 +69,10 @@ default_attributes(
       }
     },
     :default_qdisc => {
-      :comment => "Use fq as the default queuing discipline",
+      :comment => "Use fq as the default queuing discipline and bbr for congestion control",
       :parameters => {
-        "net.core.default_qdisc" => "fq"
+        "net.core.default_qdisc" => "fq",
+        "net.ipv4.tcp_congestion_control" => "bbr"
       }
     },
     :tune_cpu_scheduler => {

diff --git a/roles/tile.rb b/roles/tile.rb
index c4b0834d1e1f28265bf974ac0d7901f5372caf9b..cb703ae71511b39cb172cab9e95b5a531c887b26 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -64,13 +64,6 @@ default_attributes(
         "kernel.sched_min_granularity_ns" => 10000000,
         "kernel.sched_wakeup_granularity_ns" => 15000000
       }
-    },
-    :tcp_use_bbr => {
-      :comment => "Use TCP BBR Congestion Control",
-      :parameters => {
-        "net.core.default_qdisc" => "fq",
-        "net.ipv4.tcp_congestion_control" => "bbr"
-      }
     }
   },
   :tile => {

diff --git a/roles/tilecache.rb b/roles/tilecache.rb
index c9badd05d17823089494ccb95b3f666f287f9e11..8353a21209d62f40a32ac1c2584a14f28d50985b 100644 (file)
--- a/roles/tilecache.rb
+++ b/roles/tilecache.rb
@@ -73,20 +73,6 @@ default_attributes(
         "kernel.sched_min_granularity_ns" => "10000000",
         "kernel.sched_wakeup_granularity_ns" => "15000000"
       }
-    },
-    :no_tcp_slow_start => {
-      :comment => "REMOVE ME: Temporary Reset TCP slow start back to kernel default",
-      :parameters => {
-          "net.ipv4.tcp_slow_start_after_idle" => "1",
-          "net.ipv4.tcp_no_metrics_save" => "0"
-      }
-    },
-    :tcp_use_bbr => {
-      :comment => "Use TCP BBR Congestion Control",
-      :parameters => {
-        "net.core.default_qdisc" => "fq",
-        "net.ipv4.tcp_congestion_control" => "bbr"
-      }
     }
   }
 )