Elukey has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/370644 )

Change subject: role::cache::kafka::[el|statsv]: force kafka protocol to 0.9.0.1
......................................................................


role::cache::kafka::[el|statsv]: force kafka protocol to 0.9.0.1

This change implements a workaround for kafka protocol
versions 0.9.0.[0,1] to limit the effects of unwanted
timeouts for producers while negotiating the protocol
version with the broker. These options will set the
corresponding librdkafka tunables as described in:

https://github.com/edenhill/librdkafka/wiki/Broker-version-compatibility

The change is not applied to webrequest as precaution,
it will be done in a subsequent commit.

Related change: https://gerrit.wikimedia.org/r/#/c/370631/

Bug: T172681
Change-Id: I11fc5cf0e0d133ba51c594e5a21ff61906e64455
---
M modules/role/manifests/cache/kafka/eventlogging.pp
M modules/role/manifests/cache/kafka/statsv.pp
M modules/varnishkafka
3 files changed, 9 insertions(+), 5 deletions(-)

Approvals:
  Elukey: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/role/manifests/cache/kafka/eventlogging.pp 
b/modules/role/manifests/cache/kafka/eventlogging.pp
index d4a213b..fbd2a00 100644
--- a/modules/role/manifests/cache/kafka/eventlogging.pp
+++ b/modules/role/manifests/cache/kafka/eventlogging.pp
@@ -15,8 +15,9 @@
 #   Default 'varnish-frontend'
 #
 class role::cache::kafka::eventlogging(
-    $varnish_name = 'frontend',
-    $varnish_svc_name = 'varnish-frontend'
+    $varnish_name           = 'frontend',
+    $varnish_svc_name       = 'varnish-frontend',
+    $kafka_protocol_version = '0.9.0.1',
 ) inherits role::cache::kafka
 {
     # Set varnish.arg.q or varnish.arg.m according to Varnish version
@@ -39,6 +40,7 @@
         varnish_opts                => $varnish_opts,
         topic_request_required_acks => '1',
         conf_template               => $conf_template,
+        force_protocol_version      => $kafka_protocol_version,
     }
 
     include ::standard
diff --git a/modules/role/manifests/cache/kafka/statsv.pp 
b/modules/role/manifests/cache/kafka/statsv.pp
index 5b1de78..6843229 100644
--- a/modules/role/manifests/cache/kafka/statsv.pp
+++ b/modules/role/manifests/cache/kafka/statsv.pp
@@ -15,8 +15,9 @@
 #   Default 'varnish-frontend'
 #
 class role::cache::kafka::statsv(
-    $varnish_name = 'frontend',
-    $varnish_svc_name = 'varnish-frontend'
+    $varnish_name           = 'frontend',
+    $varnish_svc_name       = 'varnish-frontend',
+    $kafka_protocol_version = '0.9.0.1',
 ) inherits role::cache::kafka
 {
     $format  = "%{fake_tag0@hostname?${::fqdn}}x %{%FT%T@dt}t 
%{X-Client-IP@ip}o %{@uri_path}U %{@uri_query}q %{User-Agent@user_agent}i"
@@ -39,6 +40,7 @@
         # -1 means all brokers in the ISR must ACK this request.
         topic_request_required_acks => '-1',
         conf_template               => $conf_template,
+        force_protocol_version      => $kafka_protocol_version,
     }
 
     include ::standard
diff --git a/modules/varnishkafka b/modules/varnishkafka
index 8822159..a3651c8 160000
--- a/modules/varnishkafka
+++ b/modules/varnishkafka
@@ -1 +1 @@
-Subproject commit 8822159469238c14aedfaf01d15e27658199a157
+Subproject commit a3651c852cfc00d6c3a81a0608b3328b5fb6159c

-- 
To view, visit https://gerrit.wikimedia.org/r/370644
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I11fc5cf0e0d133ba51c594e5a21ff61906e64455
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey <ltosc...@wikimedia.org>
Gerrit-Reviewer: Elukey <ltosc...@wikimedia.org>
Gerrit-Reviewer: Ottomata <ao...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to