Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/84040
Change subject: Matching kafka.default.erb with updated /etc/default/kafka in
latest 0.8 deb.
......................................................................
Matching kafka.default.erb with updated /etc/default/kafka in latest 0.8 deb.
Now supporting $heap_opts for configuring min and max JVM heap sizes
Change-Id: I946fecf9f8f177b7c9a3648834dd9652a8d273a0
---
M manifests/defaults.pp
M manifests/server.pp
M templates/kafka.default.erb
3 files changed, 18 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/kafka
refs/changes/40/84040/1
diff --git a/manifests/defaults.pp b/manifests/defaults.pp
index b81a462..72b3b04 100644
--- a/manifests/defaults.pp
+++ b/manifests/defaults.pp
@@ -27,6 +27,7 @@
$jmx_port = 9999
$log_dir = ['/var/spool/kafka']
$num_partitions = 1
+ $heap_opts = undef
$num_network_threads = 2
$num_io_threads = 2
diff --git a/manifests/server.pp b/manifests/server.pp
index b2faa8d..1c29880 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -59,6 +59,7 @@
$log_dir = $kafka::defaults::log_dir,
$jmx_port = $kafka::defaults::jmx_port,
$num_partitions = $kafka::defaults::num_partitions,
+ $heap_opts = $kafka::defaults::heap_opts,
$num_network_threads = $kafka::defaults::num_network_threads,
$num_io_threads = $kafka::defaults::num_io_threads,
diff --git a/templates/kafka.default.erb b/templates/kafka.default.erb
index 9cbf7fe..31112c4 100644
--- a/templates/kafka.default.erb
+++ b/templates/kafka.default.erb
@@ -3,16 +3,22 @@
# whether to allow init.d script to start a kafka broker ("yes", "no")
KAFKA_START=<%= @enabled ? 'yes' : 'no' %>
-# The default JMX_PORT for Kafka Brokers is 9999.
-# Set JMX_PORT to something else to override this.
-JMX_PORT=<%= @jmx_port %>
-
-# JMX options
-KAFKA_JMX_OPTS=${KAFKA_JMX_OPTS:="-Dcom.sun.management.jmxremote
-Dcom.sun.management.jmxremote.authenticate=false
-Dcom.sun.management.jmxremote.ssl=false"}
-
-# Memory sizes, and logging configuration
-KAFKA_OPTS=${KAFKA_OPTS:="-Xmx512M -server
-Dlog4j.configuration=file:/etc/kafka/log4j.properties"}
-
# User and group to run as
KAFKA_USER=kafka
KAFKA_GROUP=kafka
+KAFKA_CONFIG=/etc/kafka
+
+# The default JMX_PORT for Kafka Brokers is 9999.
+# Set JMX_PORT to something else to override this.
+JMX_PORT=<%= @jmx_port %>
+#KAFKA_JMX_OPTS=${KAFKA_JMX_OPTS:="-Dcom.sun.management.jmxremote
-Dcom.sun.management.jmxremote.authenticate=false
-Dcom.sun.management.jmxremote.ssl=false"}
+
+# Memory sizes, and logging configuration
+<% if @heap_opts -%>
+KAFKA_HEAP_OPTS=<%= @heap_opts %>
+<% else -%>
+#KAFKA_HEAP_OPTS="-Xmx1G -Xms1G"
+<% end -%>
+#KAFKA_JVM_PERFORMANCE_OPTS="-server -XX:+UseCompressedOops -XX:+UseParNewGC
-XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled
-XX:+CMSScavengeBeforeRemark -XX:+DisableExplicitGC"
+#KAFKA_LOG4J_OPTS="-Dlog4j.configuration=file:${KAFKA_CONFIG}/log4j.properties"
+#KAFKA_OPTS=""
--
To view, visit https://gerrit.wikimedia.org/r/84040
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I946fecf9f8f177b7c9a3648834dd9652a8d273a0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/kafka
Gerrit-Branch: master
Gerrit-Owner: Ottomata <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
