summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDana Powers <dana.powers@rd.io>2015-06-10 11:21:21 -0700
committerDana Powers <dana.powers@rd.io>2015-06-10 11:21:21 -0700
commit04cf4b36686131af392f401a32be7bf5567fb7c2 (patch)
tree2546575d40b138856d52ba5d6de6bdbbce774017
parent6a3e813199f352bf14355ba375d86fc3f1024c9a (diff)
downloadkafka-python-04cf4b36686131af392f401a32be7bf5567fb7c2.tar.gz
Use 500ms zookeeper session timeout for integration tests - no network here, and our restarts are fast
-rw-r--r--servers/0.8.0/resources/kafka.properties4
-rw-r--r--servers/0.8.1.1/resources/kafka.properties2
-rw-r--r--servers/0.8.1/resources/kafka.properties4
-rw-r--r--servers/0.8.2.0/resources/kafka.properties2
4 files changed, 12 insertions, 0 deletions
diff --git a/servers/0.8.0/resources/kafka.properties b/servers/0.8.0/resources/kafka.properties
index 1aafd46..b9f5c49 100644
--- a/servers/0.8.0/resources/kafka.properties
+++ b/servers/0.8.0/resources/kafka.properties
@@ -53,7 +53,11 @@ log.cleanup.interval.mins=1
############################# Zookeeper #############################
zookeeper.connect={zk_host}:{zk_port}/{zk_chroot}
+
+# Timeout in ms for connecting to zookeeper
zookeeper.connection.timeout.ms=1000000
+# We want to expire kafka broker sessions quickly when brokers die b/c we restart them quickly
+zookeeper.session.timeout.ms=500
kafka.metrics.polling.interval.secs=5
kafka.metrics.reporters=kafka.metrics.KafkaCSVMetricsReporter
diff --git a/servers/0.8.1.1/resources/kafka.properties b/servers/0.8.1.1/resources/kafka.properties
index a59ef60..685aed1 100644
--- a/servers/0.8.1.1/resources/kafka.properties
+++ b/servers/0.8.1.1/resources/kafka.properties
@@ -120,3 +120,5 @@ zookeeper.connect={zk_host}:{zk_port}/{zk_chroot}
# Timeout in ms for connecting to zookeeper
zookeeper.connection.timeout.ms=1000000
+# We want to expire kafka broker sessions quickly when brokers die b/c we restart them quickly
+zookeeper.session.timeout.ms=500
diff --git a/servers/0.8.1/resources/kafka.properties b/servers/0.8.1/resources/kafka.properties
index af67a91..76b0cb4 100644
--- a/servers/0.8.1/resources/kafka.properties
+++ b/servers/0.8.1/resources/kafka.properties
@@ -60,4 +60,8 @@ log.cleaner.enable=false
# You can also append an optional chroot string to the urls to specify the
# root directory for all kafka znodes.
zookeeper.connect={zk_host}:{zk_port}/{zk_chroot}
+
+# Timeout in ms for connecting to zookeeper
zookeeper.connection.timeout.ms=1000000
+# We want to expire kafka broker sessions quickly when brokers die b/c we restart them quickly
+zookeeper.session.timeout.ms=500
diff --git a/servers/0.8.2.0/resources/kafka.properties b/servers/0.8.2.0/resources/kafka.properties
index a59ef60..685aed1 100644
--- a/servers/0.8.2.0/resources/kafka.properties
+++ b/servers/0.8.2.0/resources/kafka.properties
@@ -120,3 +120,5 @@ zookeeper.connect={zk_host}:{zk_port}/{zk_chroot}
# Timeout in ms for connecting to zookeeper
zookeeper.connection.timeout.ms=1000000
+# We want to expire kafka broker sessions quickly when brokers die b/c we restart them quickly
+zookeeper.session.timeout.ms=500