From 17e38ad8c62ac8f1c8f983e63181f69879a45d85 Mon Sep 17 00:00:00 2001
From: Jiri Mencak <jmencak@redhat.com>
Date: Tue, 3 Oct 2017 19:57:01 +0200
Subject: Separate tuned daemon setup into a role.

Currently, profiles for the tuned daemon are set only for
OpenShift node(s).  This excludes the OpenShift loadbalancer.
As a result, ARP cache limits on loadbalancers are not raised.
This causes problems with HA setups where loadbalancers serve
1k+ OpenShift nodes.

This commit ensures the openshift-control-plane role is applied
to loadbalancers, masters and OpenShift infra nodes.  Regular
OpenShift worker nodes get the openshift-node profile.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1498213
---
 .../tuned/openshift-control-plane/tuned.conf       | 25 ----------------------
 .../templates/tuned/openshift-node/tuned.conf      | 10 ---------
 .../templates/tuned/openshift/tuned.conf           | 24 ---------------------
 .../openshift_node/templates/tuned/recommend.conf  |  8 -------
 4 files changed, 67 deletions(-)
 delete mode 100644 roles/openshift_node/templates/tuned/openshift-control-plane/tuned.conf
 delete mode 100644 roles/openshift_node/templates/tuned/openshift-node/tuned.conf
 delete mode 100644 roles/openshift_node/templates/tuned/openshift/tuned.conf
 delete mode 100644 roles/openshift_node/templates/tuned/recommend.conf

(limited to 'roles/openshift_node/templates')

diff --git a/roles/openshift_node/templates/tuned/openshift-control-plane/tuned.conf b/roles/openshift_node/templates/tuned/openshift-control-plane/tuned.conf
deleted file mode 100644
index f22f21065..000000000
--- a/roles/openshift_node/templates/tuned/openshift-control-plane/tuned.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# tuned configuration
-#
-
-[main]
-summary=Optimize systems running OpenShift control plane
-include=openshift
-
-[sysctl]
-# ktune sysctl settings, maximizing i/o throughput
-#
-# Minimal preemption granularity for CPU-bound tasks:
-# (default: 1 msec#  (1 + ilog(ncpus)), units: nanoseconds)
-kernel.sched_min_granularity_ns=10000000
-
-# The total time the scheduler will consider a migrated process
-# "cache hot" and thus less likely to be re-migrated
-# (system default is 500000, i.e. 0.5 ms)
-kernel.sched_migration_cost_ns=5000000
-
-# SCHED_OTHER wake-up granularity.
-#
-# Preemption granularity when tasks wake up.  Lower the value to improve 
-# wake-up latency and throughput for latency critical tasks.
-kernel.sched_wakeup_granularity_ns = 4000000
diff --git a/roles/openshift_node/templates/tuned/openshift-node/tuned.conf b/roles/openshift_node/templates/tuned/openshift-node/tuned.conf
deleted file mode 100644
index 78c7d19c9..000000000
--- a/roles/openshift_node/templates/tuned/openshift-node/tuned.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# tuned configuration
-#
-
-[main]
-summary=Optimize systems running OpenShift nodes
-include=openshift
-
-[sysctl]
-net.ipv4.tcp_fastopen=3
diff --git a/roles/openshift_node/templates/tuned/openshift/tuned.conf b/roles/openshift_node/templates/tuned/openshift/tuned.conf
deleted file mode 100644
index 68ac5dadb..000000000
--- a/roles/openshift_node/templates/tuned/openshift/tuned.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# tuned configuration
-#
-
-[main]
-summary=Optimize systems running OpenShift (parent profile)
-include=${f:virt_check:{{ openshift_tuned_guest_profile }}:throughput-performance}
-
-[selinux]
-avc_cache_threshold=65536
-
-[net]
-nf_conntrack_hashsize=131072
-
-[sysctl]
-kernel.pid_max=131072
-net.netfilter.nf_conntrack_max=1048576
-fs.inotify.max_user_watches=65536
-net.ipv4.neigh.default.gc_thresh1=8192
-net.ipv4.neigh.default.gc_thresh2=32768
-net.ipv4.neigh.default.gc_thresh3=65536
-net.ipv6.neigh.default.gc_thresh1=8192
-net.ipv6.neigh.default.gc_thresh2=32768
-net.ipv6.neigh.default.gc_thresh3=65536
diff --git a/roles/openshift_node/templates/tuned/recommend.conf b/roles/openshift_node/templates/tuned/recommend.conf
deleted file mode 100644
index 5fa765798..000000000
--- a/roles/openshift_node/templates/tuned/recommend.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-[openshift-node]
-/etc/origin/node/node-config.yaml=.*region=primary
-
-[openshift-control-plane,master]
-/etc/origin/master/master-config.yaml=.*
-
-[openshift-control-plane,node]
-/etc/origin/node/node-config.yaml=.*region=infra
-- 
cgit v1.2.1