Ottomata has submitted this change and it was merged.
Change subject: Updating varnishkafka.conf with a few changes and using some
actual librdkakfa defaults.
......................................................................
Updating varnishkafka.conf with a few changes and using some actual librdkakfa
defaults.
Change-Id: Ic1b4e5da119eb4977561899bdd3ad48e2d76aba2
---
M manifests/defaults.pp
M manifests/init.pp
M templates/varnishkafka.conf.erb
3 files changed, 6 insertions(+), 8 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/manifests/defaults.pp b/manifests/defaults.pp
index 9d22e77..ccc1700 100644
--- a/manifests/defaults.pp
+++ b/manifests/defaults.pp
@@ -13,7 +13,7 @@
$format_key = undef
$partition = -1
- $queue_buffering_max_messages = 1000000
+ $queue_buffering_max_messages = 100000
$message_send_max_retries = 3
$topic_request_required_acks = 1
$topic_message_timeout_ms = 300000
diff --git a/manifests/init.pp b/manifests/init.pp
index 1638c83..785c147 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -24,7 +24,7 @@
# $partition - Topic partition number to send to. -1
for random.
# Default: -1.
# $queue_buffering_max_messages - Maximum number of messages allowed on the
-# local Kafka producer queue. Default:
1000000
+# local Kafka producer queue. Default:
100000
# $message_send_max_retries - Maximum number of retries per messageset.
# Default: 3
# $topic_request_required_acks - Required ack level. Default: 1
diff --git a/templates/varnishkafka.conf.erb b/templates/varnishkafka.conf.erb
index d259d04..cd70cea 100644
--- a/templates/varnishkafka.conf.erb
+++ b/templates/varnishkafka.conf.erb
@@ -237,6 +237,9 @@
# Maximum number of retries per messageset.
kafka.message.send.max.retries = <%= @message_send_max_retries %>
+# Use compression when sending to Kafka.. Default is none.
+# Valid values are 'none', 'gzip', and 'snappy'.
+kafka.compression.codec = <%= @compression_codec %>
#
# Topic configuration
@@ -255,10 +258,5 @@
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'.
-kafka.compression.codec = <%= @compression_codec %>
+kafka.topic.request.timeout.ms = <%= @topic_request_timeout_ms %>
<% end -%>
--
To view, visit https://gerrit.wikimedia.org/r/94927
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic1b4e5da119eb4977561899bdd3ad48e2d76aba2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/varnishkafka
Gerrit-Branch: master
Gerrit-Owner: Ottomata <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
