summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-10-31 05:29:12 -0700
committerGitHub <noreply@github.com>2017-10-31 05:29:12 -0700
commitf879d554c44b529b26b9908cd61b0e7e7cebf102 (patch)
treedce7daf47cedb682013cc78c3a4f116b9c05d13b
parentdd5cee2a152437ae1afc3a9574451cc7c1475d2b (diff)
parent90b0ab18f62e362052868d89cba6fb0e0f3f142b (diff)
downloadopenshift-f879d554c44b529b26b9908cd61b0e7e7cebf102.tar.gz
openshift-f879d554c44b529b26b9908cd61b0e7e7cebf102.tar.bz2
openshift-f879d554c44b529b26b9908cd61b0e7e7cebf102.tar.xz
openshift-f879d554c44b529b26b9908cd61b0e7e7cebf102.zip
Merge pull request #5919 from pecameron/cache-size
Automatic merge from submit-queue. dnsmasq cache-size dns-forward-max change On very large clusters dnsmasq performance suffers due to limited cache-size and dns-forward-max values. bug: 1482847 https://bugzilla.redhat.com/show_bug.cgi?id=1482847
-rwxr-xr-xroles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh2
-rw-r--r--roles/openshift_node_dnsmasq/templates/origin-dns.conf.j22
2 files changed, 4 insertions, 0 deletions
diff --git a/roles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh b/roles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh
index 230f0a28c..f4e48b5b7 100755
--- a/roles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh
+++ b/roles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh
@@ -54,6 +54,8 @@ domain-needed
server=/cluster.local/172.30.0.1
server=/30.172.in-addr.arpa/172.30.0.1
enable-dbus
+dns-forward-max=5000
+cache-size=5000
EOF
# New config file, must restart
NEEDS_RESTART=1
diff --git a/roles/openshift_node_dnsmasq/templates/origin-dns.conf.j2 b/roles/openshift_node_dnsmasq/templates/origin-dns.conf.j2
index 5c9601277..4b55a0be4 100644
--- a/roles/openshift_node_dnsmasq/templates/origin-dns.conf.j2
+++ b/roles/openshift_node_dnsmasq/templates/origin-dns.conf.j2
@@ -3,6 +3,8 @@ domain-needed
no-negcache
max-cache-ttl=1
enable-dbus
+dns-forward-max=5000
+cache-size=5000
bind-interfaces
{% for interface in openshift_node_dnsmasq_except_interfaces %}
except-interface={{ interface }}