Browse Source

Merge "Update nr_open limit value in the amphora" into stable/victoria

changes/28/820328/1
Zuul 6 months ago committed by Gerrit Code Review
parent
commit
c0a0e02083
  1. 4
      elements/haproxy-octavia/post-install.d/20-haproxy-tune-kernel
  2. 2
      octavia/amphorae/backends/agent/api_server/templates/systemd.conf.j2
  3. 6
      releasenotes/notes/fix-nr_open-limit-value-7f475c3e301a608d.yaml

4
elements/haproxy-octavia/post-install.d/20-haproxy-tune-kernel

@ -12,8 +12,8 @@ sysctl-write-value net.core.somaxconn 65534
sysctl-write-value net.ipv4.tcp_synack_retries 3
sysctl-write-value net.core.netdev_max_backlog 100000
# This should allow HAProxy maxconn to be 1,000,000
sysctl-write-value fs.file-max 2097152
sysctl-write-value fs.nr_open 2097152
sysctl-write-value fs.file-max 2600000
sysctl-write-value fs.nr_open 2600000
# It's ok for these to fail if conntrack module isn't loaded
sysctl-write-value net.netfilter.nf_conntrack_tcp_timeout_time_wait 5 || true

2
octavia/amphorae/backends/agent/api_server/templates/systemd.conf.j2

@ -30,7 +30,7 @@ Type=notify
KillMode=mixed
Restart=always
LimitNOFILE=2097152
LimitNOFILE=2600000
[Install]
WantedBy=multi-user.target

6
releasenotes/notes/fix-nr_open-limit-value-7f475c3e301a608d.yaml

@ -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…
Cancel
Save