Merge "Update nr_open limit value in the amphora" into stable/train
This commit is contained in:
commit
8ae68f2d83
|
@ -13,8 +13,8 @@ sysctl-write-value net.core.somaxconn 65534
|
||||||
sysctl-write-value net.ipv4.tcp_synack_retries 3
|
sysctl-write-value net.ipv4.tcp_synack_retries 3
|
||||||
sysctl-write-value net.core.netdev_max_backlog 100000
|
sysctl-write-value net.core.netdev_max_backlog 100000
|
||||||
# This should allow HAProxy maxconn to be 1,000,000
|
# This should allow HAProxy maxconn to be 1,000,000
|
||||||
sysctl-write-value fs.file-max 2097152
|
sysctl-write-value fs.file-max 2600000
|
||||||
sysctl-write-value fs.nr_open 2097152
|
sysctl-write-value fs.nr_open 2600000
|
||||||
|
|
||||||
# It's ok for these to fail if conntrack module isn't loaded
|
# It's ok for these to fail if conntrack module isn't loaded
|
||||||
sysctl-write-value net.ipv4.netfilter.ip_conntrack_tcp_timeout_time_wait 5 || true
|
sysctl-write-value net.ipv4.netfilter.ip_conntrack_tcp_timeout_time_wait 5 || true
|
||||||
|
|
|
@ -30,7 +30,7 @@ Type=notify
|
||||||
|
|
||||||
KillMode=mixed
|
KillMode=mixed
|
||||||
Restart=always
|
Restart=always
|
||||||
LimitNOFILE=2097152
|
LimitNOFILE=2600000
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
---
|
||||||
|
fixes:
|
||||||
|
- |
|
||||||
|
Increase the limit value for nr_open and file-max in the amphora, the new
|
||||||
|
value is based on what HAProxy 2.x is expecting from the system with the
|
||||||
|
greatest maxconn value that Octavia can set.
|
Loading…
Reference in New Issue