diff --git a/core/src/com/cloud/network/HAProxyConfigurator.java b/core/src/com/cloud/network/HAProxyConfigurator.java index 23d35f81364..00ba0d34fe9 100644 --- a/core/src/com/cloud/network/HAProxyConfigurator.java +++ b/core/src/com/cloud/network/HAProxyConfigurator.java @@ -38,7 +38,7 @@ import com.cloud.utils.net.NetUtils; */ public class HAProxyConfigurator implements LoadBalancerConfigurator { private static String [] globalSection = {"global", - "\tlog 127.0.0.1:3914 local0 info", + "\tlog 127.0.0.1:3914 local0 warning", "\tmaxconn 4096", "\tchroot /var/lib/haproxy", "\tuser haproxy", @@ -139,8 +139,7 @@ public class HAProxyConfigurator implements LoadBalancerConfigurator { sb = new StringBuilder(); sb.append("\t").append("server ").append(poolName) .append("_").append(Integer.toString(i++)).append(" ") - .append(rule.getDstIp()).append(":").append(rule.getDstPortRange()[0]) - .append(" check"); + .append(rule.getDstIp()).append(":").append(rule.getDstPortRange()[0]); result.add(sb.toString()); } result.add(getBlankLine()); diff --git a/patches/systemvm/debian/config/etc/sysctl.conf b/patches/systemvm/debian/config/etc/sysctl.conf index 71acc2b6f04..71b90f08d2a 100644 --- a/patches/systemvm/debian/config/etc/sysctl.conf +++ b/patches/systemvm/debian/config/etc/sysctl.conf @@ -36,4 +36,7 @@ kernel.core_uses_pid = 1 # Controls the use of TCP syncookies net.ipv4.tcp_syncookies = 1 -net.ipv4.netfilter.ip_conntrack_max=65536 +net.ipv4.netfilter.ip_conntrack_max=1000000 +net.ipv4.tcp_tw_reuse=1 +net.ipv4.tcp_max_tw_buckets=1000000 +net.core.somaxconn=1000000