Ppchelko has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/349280 )
Change subject: Kafka: Enable topic deletion for the main kafka cluster
......................................................................
Kafka: Enable topic deletion for the main kafka cluster
We need to clean up stale topics in the main kafka cluster,
but by default topic deletion is not allowed.
Bug: T163392
Change-Id: I33bf1e294f683c1f8550c31724b1d9922bc20e98
---
M hieradata/common.yaml
M modules/confluent/manifests/kafka/broker.pp
M modules/confluent/templates/kafka/server.properties.erb
3 files changed, 10 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/80/349280/1
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index d3f99b8..4e6d33a 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -432,6 +432,7 @@
main-eqiad:
api_version: 0.9
zookeeper_cluster_name: main-eqiad
+ delete_topic_enable: true
brokers:
kafka1001.eqiad.wmnet:
id: 1001
@@ -443,6 +444,7 @@
main-codfw:
api_version: 0.9
zookeeper_cluster_name: main-codfw
+ delete_topic_enable: true
brokers:
kafka2001.codfw.wmnet:
id: 2001
diff --git a/modules/confluent/manifests/kafka/broker.pp
b/modules/confluent/manifests/kafka/broker.pp
index 6716ea9..78a3587 100644
--- a/modules/confluent/manifests/kafka/broker.pp
+++ b/modules/confluent/manifests/kafka/broker.pp
@@ -44,6 +44,9 @@
# [*auto_create_topics_enable*]
# If autocreation of topics is allowed. Default: true
#
+# [*delete_topic_enable*]
+# Whether to enable topic deletion. Default: false
+#
# [*auto_leader_rebalance_enable*]
# If leaders should be auto rebalanced. Default: true
#
@@ -191,6 +194,7 @@
$zookeeper_session_timeout_ms = 6000,
$auto_create_topics_enable = true,
+ $delete_topic_enable = false,
$auto_leader_rebalance_enable = true,
$num_partitions = 1,
diff --git a/modules/confluent/templates/kafka/server.properties.erb
b/modules/confluent/templates/kafka/server.properties.erb
index 7224937..fcbd3d8 100644
--- a/modules/confluent/templates/kafka/server.properties.erb
+++ b/modules/confluent/templates/kafka/server.properties.erb
@@ -240,4 +240,7 @@
# value with your actual Confluent customer ID. Doing so will ensure
# that additional support metrics will be collected and reported.
#
-confluent.support.customer.id=anonymous
\ No newline at end of file
+confluent.support.customer.id=anonymous
+
+# Whether to allow topic deletion
+delete.topic.enable=<%= @delete_topic_enable %>
--
To view, visit https://gerrit.wikimedia.org/r/349280
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I33bf1e294f683c1f8550c31724b1d9922bc20e98
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ppchelko <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
