summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2015-08-05 16:41:30 -0400
committerScott Dodson <sdodson@redhat.com>2015-08-05 16:43:11 -0400
commitad6a70ebdb5bfd0fad4609b57ace2d27be301cc3 (patch)
tree4bd88a4190fc077bf79cc3023dd5312f9cba931b
parentc76ded1fd1c67059086a18b3af28190aa8c641f2 (diff)
downloadopenshift-ad6a70ebdb5bfd0fad4609b57ace2d27be301cc3.tar.gz
openshift-ad6a70ebdb5bfd0fad4609b57ace2d27be301cc3.tar.bz2
openshift-ad6a70ebdb5bfd0fad4609b57ace2d27be301cc3.tar.xz
openshift-ad6a70ebdb5bfd0fad4609b57ace2d27be301cc3.zip
Reduce heartbeat frequency to 500ms to reduce etcd cpu load
Per https://github.com/coreos/etcd/pull/3097 reduce heartbeat to 500ms until we can ensure etcd 2.1 is in use Reduces the impact of but doesn't fix BZ1250310
-rw-r--r--roles/etcd/templates/etcd.conf.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/etcd/templates/etcd.conf.j2 b/roles/etcd/templates/etcd.conf.j2
index 801be2c97..9ac23b1dd 100644
--- a/roles/etcd/templates/etcd.conf.j2
+++ b/roles/etcd/templates/etcd.conf.j2
@@ -16,8 +16,8 @@ ETCD_NAME=default
{% endif %}
ETCD_DATA_DIR={{ etcd_data_dir }}
#ETCD_SNAPSHOT_COUNTER="10000"
-#ETCD_HEARTBEAT_INTERVAL="100"
-#ETCD_ELECTION_TIMEOUT="1000"
+ETCD_HEARTBEAT_INTERVAL="500"
+ETCD_ELECTION_TIMEOUT="2500"
ETCD_LISTEN_CLIENT_URLS={{ etcd_listen_client_urls }}
#ETCD_MAX_SNAPSHOTS="5"
#ETCD_MAX_WALS="5"