Ottomata has submitted this change and it was merged. Change subject: Revert min.insync.replicas to 1, set api_version for eventbus Kafka producer ......................................................................
Revert min.insync.replicas to 1, set api_version for eventbus Kafka producer Bug: T142430, T144637 Change-Id: I99a2cc02b499b4ffbedb8ef75d1c77b666733ced --- M modules/role/manifests/eventbus/eventbus.pp M modules/role/manifests/kafka/main/broker.pp 2 files changed, 8 insertions(+), 9 deletions(-) Approvals: Ottomata: Verified; Looks good to me, approved diff --git a/modules/role/manifests/eventbus/eventbus.pp b/modules/role/manifests/eventbus/eventbus.pp index a7a3024..0fc3f60 100644 --- a/modules/role/manifests/eventbus/eventbus.pp +++ b/modules/role/manifests/eventbus/eventbus.pp @@ -36,6 +36,13 @@ $kafka_brokers_array = $config['brokers']['array'] $kafka_base_uri = inline_template('kafka:///<%= @kafka_brokers_array.join(":9092,") + ":9092" %>') + $kafka_api_version = $config['api_version'] + # Append this to query params if set. + $kafka_api_version_param = $kafka_api_version ? { + undef => '', + default => "&api_version=${kafka_api_version}" + } + $outputs = [ # When events are produced to kafka, the # topic produced to will be interpolated from the event @@ -44,7 +51,7 @@ # meta[topic] == mediawiki.revision_create # in eqiad will be produced to # eqiad.mediawiki.revsion_create - "${kafka_base_uri}?async=False&topic=${::site}.{meta[topic]}" + "${kafka_base_uri}?async=False&topic=${::site}.{meta[topic]}${kafka_api_version_param}" ] $access_log_level = $::realm ? { diff --git a/modules/role/manifests/kafka/main/broker.pp b/modules/role/manifests/kafka/main/broker.pp index 94304a7..cbe9cb4 100644 --- a/modules/role/manifests/kafka/main/broker.pp +++ b/modules/role/manifests/kafka/main/broker.pp @@ -27,12 +27,6 @@ # If we've got at least 3 brokers, set default replication factor to 3. $replication_factor = min(3, $config['brokers']['size']) - # Use 2 if replication factor is 3, else 1 - $min_insync_replicas = $replication_factor ? { - 3 => 2, - default => 1, - } - file { '/srv/kafka': ensure => 'directory', mode => '0755', @@ -49,8 +43,6 @@ auto_leader_rebalance_enable => false, default_replication_factor => $replication_factor, - min_insync_replicas => $min_insync_replicas, - # Start with a low number of (auto created) partitions per # topic. This can be increased manually for high volume # topics if necessary. -- To view, visit https://gerrit.wikimedia.org/r/324801 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I99a2cc02b499b4ffbedb8ef75d1c77b666733ced Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ottomata <o...@wikimedia.org> Gerrit-Reviewer: Ottomata <o...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits