From 67c05c6c4b484a6cdac9473b4e6951e5c76c42a3 Mon Sep 17 00:00:00 2001
From: Grant Slater <git@firefishy.com>
Date: Fri, 3 Jan 2020 18:59:53 +0000
Subject: [PATCH] Base: switch to BBR for Congestion Control

---
 roles/base.rb      |  5 +++--
 roles/tile.rb      |  7 -------
 roles/tilecache.rb | 14 --------------
 3 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/roles/base.rb b/roles/base.rb
index cad8821f7..bc08d820c 100644
--- 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 c4b0834d1..cb703ae71 100644
--- 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 c9badd05d..8353a2120 100644
--- 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"
-      }
     }
   }
 )
-- 
2.39.5