Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/94175
Change subject: Adding config for topic_request_timeout_ms
......................................................................
Adding config for topic_request_timeout_ms
Change-Id: I6e01034d288a661b50c59d7d95f9d0e1079c7eae
---
M manifests/defaults.pp
M manifests/init.pp
M templates/varnishkafka.conf.erb
3 files changed, 11 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/varnishkafka
refs/changes/75/94175/1
diff --git a/manifests/defaults.pp b/manifests/defaults.pp
index 950500c..9d22e77 100644
--- a/manifests/defaults.pp
+++ b/manifests/defaults.pp
@@ -16,7 +16,8 @@
$queue_buffering_max_messages = 1000000
$message_send_max_retries = 3
$topic_request_required_acks = 1
- $topic_message_timeout_ms = 60000
+ $topic_message_timeout_ms = 300000
+ $topic_request_timeout_ms = 5000
$compression_codec = 'none'
$varnish_opts = {
diff --git a/manifests/init.pp b/manifests/init.pp
index 50c93c2..1638c83 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -29,7 +29,9 @@
# Default: 3
# $topic_request_required_acks - Required ack level. Default: 1
# $topic_message_timeout_ms - Local message timeout (milliseconds).
-# Default: 60000
+# Default: 300000
+# $topic_request_timeout_ms - Ack timeout of the produce request.
+# Default: 5000
# $compression_codec - Compression codec to use when sending
batched messages to
# Kafka. Valid values are 'none', 'gzip',
and 'snappy'.
# Default: none
@@ -72,6 +74,7 @@
$message_send_max_retries =
$varnishkafka::defaults::message_send_max_retries,
$topic_request_required_acks =
$varnishkafka::defaults::topic_request_required_acks,
$topic_message_timeout_ms =
$varnishkafka::defaults::topic_message_timeout_ms,
+ $topic_request_timeout_ms =
$varnishkafka::defaults::topic_request_timeout_ms,
$compression_codec =
$varnishkafka::defaults::compression_codec,
$varnish_opts = $varnishkafka::defaults::varnish_opts,
diff --git a/templates/varnishkafka.conf.erb b/templates/varnishkafka.conf.erb
index 047d06a..d259d04 100644
--- a/templates/varnishkafka.conf.erb
+++ b/templates/varnishkafka.conf.erb
@@ -252,7 +252,11 @@
kafka.topic.request.required.acks = <%= @topic_request_required_acks %>
# Local message timeout (milliseconds)
-kafka.topic.message.timeout.ms = <%= topic_message_timeout_ms %>
+kafka.topic.message.timeout.ms = <%= @topic_message_timeout_ms %>
+
+# The ack timeout of the producer request in milliseconds
+kafka.topic.message.timeout.ms = <%= @topic_request_timeout_ms %>
+
# Use compression when sending to Kafka.. Default is none.
# Valid values are 'none', 'gzip', and 'snappy'.
--
To view, visit https://gerrit.wikimedia.org/r/94175
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e01034d288a661b50c59d7d95f9d0e1079c7eae
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/varnishkafka
Gerrit-Branch: master
Gerrit-Owner: Ottomata <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
