summaryrefslogtreecommitdiff
diff options
authorHaw Loeung <[email protected]>2025-06-24 04:32:33 +0000
committerCanonical IS Mergebot <[email protected]>2025-06-24 04:32:33 +0000
commitd22eeaf4be7531b8af49feb057a30043a3f9218e (patch)
tree7c28754da2e920a8332b5cad6757c3e5731a6d2f
parent795910059aa6fd51ecb49721d9c3d04b2b43ab4f (diff)
parentcf70aa0d0ca2695a01857247f02b35cc782e7fba (diff)
sysctl: Reduce timeout of a locally closed TCP connection (net.ipv4.tcp_orphan_retries)
Reviewed-on: https://code.launchpad.net/~hloeung/content-cache-charm/+git/content-cache-charm/+merge/487614 Reviewed-by: 🤖 Canonical IS Review Bot <[email protected]>
-rw-r--r--templates/sysctl_conf.tmpl3
-rw-r--r--tests/unit/files/sysctl.conf3
-rw-r--r--tests/unit/files/sysctl_core.conf3
-rw-r--r--tests/unit/files/sysctl_core_default_qdisc.conf3
-rw-r--r--tests/unit/files/sysctl_core_default_qdisc_none.conf3
-rw-r--r--tests/unit/files/sysctl_core_default_somaxconn_none.conf3
-rw-r--r--tests/unit/files/sysctl_core_somaxconn.conf3
-rw-r--r--tests/unit/files/sysctl_net_tcp_congestion_control.conf3
-rw-r--r--tests/unit/files/sysctl_net_tcp_congestion_control_bbr2.conf3
-rw-r--r--tests/unit/files/sysctl_net_tcp_congestion_control_no_bbr.conf3
-rw-r--r--tests/unit/files/sysctl_net_tcp_mem.conf3
-rw-r--r--tests/unit/files/sysctl_net_tcp_mem_none.conf3
-rw-r--r--tests/unit/files/sysctl_nf_conntrack_max.conf3
-rw-r--r--tests/unit/files/sysctl_nf_conntrack_max_none.conf3
14 files changed, 42 insertions, 0 deletions
diff --git a/templates/sysctl_conf.tmpl b/templates/sysctl_conf.tmpl
index c80f514..21640cf 100644
--- a/templates/sysctl_conf.tmpl
+++ b/templates/sysctl_conf.tmpl
@@ -48,3 +48,6 @@ net.ipv4.tcp_slow_start_after_idle=0
# https://blog.cloudflare.com/optimizing-tcp-for-high-throughput-and-low-latency/
net.ipv4.tcp_rmem = 8192 262144 1073741824
net.ipv4.tcp_wmem = 4096 16384 1073741824
+
+# Reduce timeout of a locally closed TCP connection. Default 0 which internally sets to 8.
+net.ipv4.tcp_orphan_retries = 4
diff --git a/tests/unit/files/sysctl.conf b/tests/unit/files/sysctl.conf
index 01a441a..8af8ca7 100644
--- a/tests/unit/files/sysctl.conf
+++ b/tests/unit/files/sysctl.conf
@@ -37,3 +37,6 @@ net.ipv4.tcp_slow_start_after_idle=0
# https://blog.cloudflare.com/optimizing-tcp-for-high-throughput-and-low-latency/
net.ipv4.tcp_rmem = 8192 262144 1073741824
net.ipv4.tcp_wmem = 4096 16384 1073741824
+
+# Reduce timeout of a locally closed TCP connection. Default 0 which internally sets to 8.
+net.ipv4.tcp_orphan_retries = 4
diff --git a/tests/unit/files/sysctl_core.conf b/tests/unit/files/sysctl_core.conf
index 7090466..212d4d9 100644
--- a/tests/unit/files/sysctl_core.conf
+++ b/tests/unit/files/sysctl_core.conf
@@ -28,3 +28,6 @@ net.ipv4.tcp_slow_start_after_idle=0
# https://blog.cloudflare.com/optimizing-tcp-for-high-throughput-and-low-latency/
net.ipv4.tcp_rmem = 8192 262144 1073741824
net.ipv4.tcp_wmem = 4096 16384 1073741824
+
+# Reduce timeout of a locally closed TCP connection. Default 0 which internally sets to 8.
+net.ipv4.tcp_orphan_retries = 4
diff --git a/tests/unit/files/sysctl_core_default_qdisc.conf b/tests/unit/files/sysctl_core_default_qdisc.conf
index 09dbd5b..d9d4f90 100644
--- a/tests/unit/files/sysctl_core_default_qdisc.conf
+++ b/tests/unit/files/sysctl_core_default_qdisc.conf
@@ -30,3 +30,6 @@ net.ipv4.tcp_slow_start_after_idle=0
# https://blog.cloudflare.com/optimizing-tcp-for-high-throughput-and-low-latency/
net.ipv4.tcp_rmem = 8192 262144 1073741824
net.ipv4.tcp_wmem = 4096 16384 1073741824
+
+# Reduce timeout of a locally closed TCP connection. Default 0 which internally sets to 8.
+net.ipv4.tcp_orphan_retries = 4
diff --git a/tests/unit/files/sysctl_core_default_qdisc_none.conf b/tests/unit/files/sysctl_core_default_qdisc_none.conf
index 0bc4cdc..ed01d3d 100644
--- a/tests/unit/files/sysctl_core_default_qdisc_none.conf
+++ b/tests/unit/files/sysctl_core_default_qdisc_none.conf
@@ -29,3 +29,6 @@ net.ipv4.tcp_slow_start_after_idle=0
# https://blog.cloudflare.com/optimizing-tcp-for-high-throughput-and-low-latency/
net.ipv4.tcp_rmem = 8192 262144 1073741824
net.ipv4.tcp_wmem = 4096 16384 1073741824
+
+# Reduce timeout of a locally closed TCP connection. Default 0 which internally sets to 8.
+net.ipv4.tcp_orphan_retries = 4
diff --git a/tests/unit/files/sysctl_core_default_somaxconn_none.conf b/tests/unit/files/sysctl_core_default_somaxconn_none.conf
index 5ba59db..81bd36d 100644
--- a/tests/unit/files/sysctl_core_default_somaxconn_none.conf
+++ b/tests/unit/files/sysctl_core_default_somaxconn_none.conf
@@ -29,3 +29,6 @@ net.ipv4.tcp_slow_start_after_idle=0
# https://blog.cloudflare.com/optimizing-tcp-for-high-throughput-and-low-latency/
net.ipv4.tcp_rmem = 8192 262144 1073741824
net.ipv4.tcp_wmem = 4096 16384 1073741824
+
+# Reduce timeout of a locally closed TCP connection. Default 0 which internally sets to 8.
+net.ipv4.tcp_orphan_retries = 4
diff --git a/tests/unit/files/sysctl_core_somaxconn.conf b/tests/unit/files/sysctl_core_somaxconn.conf
index 09dbd5b..d9d4f90 100644
--- a/tests/unit/files/sysctl_core_somaxconn.conf
+++ b/tests/unit/files/sysctl_core_somaxconn.conf
@@ -30,3 +30,6 @@ net.ipv4.tcp_slow_start_after_idle=0
# https://blog.cloudflare.com/optimizing-tcp-for-high-throughput-and-low-latency/
net.ipv4.tcp_rmem = 8192 262144 1073741824
net.ipv4.tcp_wmem = 4096 16384 1073741824
+
+# Reduce timeout of a locally closed TCP connection. Default 0 which internally sets to 8.
+net.ipv4.tcp_orphan_retries = 4
diff --git a/tests/unit/files/sysctl_net_tcp_congestion_control.conf b/tests/unit/files/sysctl_net_tcp_congestion_control.conf
index f87900d..c43e91a 100644
--- a/tests/unit/files/sysctl_net_tcp_congestion_control.conf
+++ b/tests/unit/files/sysctl_net_tcp_congestion_control.conf
@@ -31,3 +31,6 @@ net.ipv4.tcp_slow_start_after_idle=0
# https://blog.cloudflare.com/optimizing-tcp-for-high-throughput-and-low-latency/
net.ipv4.tcp_rmem = 8192 262144 1073741824
net.ipv4.tcp_wmem = 4096 16384 1073741824
+
+# Reduce timeout of a locally closed TCP connection. Default 0 which internally sets to 8.
+net.ipv4.tcp_orphan_retries = 4
diff --git a/tests/unit/files/sysctl_net_tcp_congestion_control_bbr2.conf b/tests/unit/files/sysctl_net_tcp_congestion_control_bbr2.conf
index 85be0f5..9346f31 100644
--- a/tests/unit/files/sysctl_net_tcp_congestion_control_bbr2.conf
+++ b/tests/unit/files/sysctl_net_tcp_congestion_control_bbr2.conf
@@ -31,3 +31,6 @@ net.ipv4.tcp_slow_start_after_idle=0
# https://blog.cloudflare.com/optimizing-tcp-for-high-throughput-and-low-latency/
net.ipv4.tcp_rmem = 8192 262144 1073741824
net.ipv4.tcp_wmem = 4096 16384 1073741824
+
+# Reduce timeout of a locally closed TCP connection. Default 0 which internally sets to 8.
+net.ipv4.tcp_orphan_retries = 4
diff --git a/tests/unit/files/sysctl_net_tcp_congestion_control_no_bbr.conf b/tests/unit/files/sysctl_net_tcp_congestion_control_no_bbr.conf
index 0bc4cdc..ed01d3d 100644
--- a/tests/unit/files/sysctl_net_tcp_congestion_control_no_bbr.conf
+++ b/tests/unit/files/sysctl_net_tcp_congestion_control_no_bbr.conf
@@ -29,3 +29,6 @@ net.ipv4.tcp_slow_start_after_idle=0
# https://blog.cloudflare.com/optimizing-tcp-for-high-throughput-and-low-latency/
net.ipv4.tcp_rmem = 8192 262144 1073741824
net.ipv4.tcp_wmem = 4096 16384 1073741824
+
+# Reduce timeout of a locally closed TCP connection. Default 0 which internally sets to 8.
+net.ipv4.tcp_orphan_retries = 4
diff --git a/tests/unit/files/sysctl_net_tcp_mem.conf b/tests/unit/files/sysctl_net_tcp_mem.conf
index fdf2d7b..002d792 100644
--- a/tests/unit/files/sysctl_net_tcp_mem.conf
+++ b/tests/unit/files/sysctl_net_tcp_mem.conf
@@ -32,3 +32,6 @@ net.ipv4.tcp_slow_start_after_idle=0
# https://blog.cloudflare.com/optimizing-tcp-for-high-throughput-and-low-latency/
net.ipv4.tcp_rmem = 8192 262144 1073741824
net.ipv4.tcp_wmem = 4096 16384 1073741824
+
+# Reduce timeout of a locally closed TCP connection. Default 0 which internally sets to 8.
+net.ipv4.tcp_orphan_retries = 4
diff --git a/tests/unit/files/sysctl_net_tcp_mem_none.conf b/tests/unit/files/sysctl_net_tcp_mem_none.conf
index 0bc4cdc..ed01d3d 100644
--- a/tests/unit/files/sysctl_net_tcp_mem_none.conf
+++ b/tests/unit/files/sysctl_net_tcp_mem_none.conf
@@ -29,3 +29,6 @@ net.ipv4.tcp_slow_start_after_idle=0
# https://blog.cloudflare.com/optimizing-tcp-for-high-throughput-and-low-latency/
net.ipv4.tcp_rmem = 8192 262144 1073741824
net.ipv4.tcp_wmem = 4096 16384 1073741824
+
+# Reduce timeout of a locally closed TCP connection. Default 0 which internally sets to 8.
+net.ipv4.tcp_orphan_retries = 4
diff --git a/tests/unit/files/sysctl_nf_conntrack_max.conf b/tests/unit/files/sysctl_nf_conntrack_max.conf
index 557ccea..766636c 100644
--- a/tests/unit/files/sysctl_nf_conntrack_max.conf
+++ b/tests/unit/files/sysctl_nf_conntrack_max.conf
@@ -31,3 +31,6 @@ net.ipv4.tcp_slow_start_after_idle=0
# https://blog.cloudflare.com/optimizing-tcp-for-high-throughput-and-low-latency/
net.ipv4.tcp_rmem = 8192 262144 1073741824
net.ipv4.tcp_wmem = 4096 16384 1073741824
+
+# Reduce timeout of a locally closed TCP connection. Default 0 which internally sets to 8.
+net.ipv4.tcp_orphan_retries = 4
diff --git a/tests/unit/files/sysctl_nf_conntrack_max_none.conf b/tests/unit/files/sysctl_nf_conntrack_max_none.conf
index 0bc4cdc..ed01d3d 100644
--- a/tests/unit/files/sysctl_nf_conntrack_max_none.conf
+++ b/tests/unit/files/sysctl_nf_conntrack_max_none.conf
@@ -29,3 +29,6 @@ net.ipv4.tcp_slow_start_after_idle=0
# https://blog.cloudflare.com/optimizing-tcp-for-high-throughput-and-low-latency/
net.ipv4.tcp_rmem = 8192 262144 1073741824
net.ipv4.tcp_wmem = 4096 16384 1073741824
+
+# Reduce timeout of a locally closed TCP connection. Default 0 which internally sets to 8.
+net.ipv4.tcp_orphan_retries = 4