Plucas has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162150
Change subject: Support extra java opts from $JAVA_OPTS
......................................................................
Support extra java opts from $JAVA_OPTS
Change-Id: I0a1879f1c707f9f0e3e5086729c42ddffb290034
---
M debian/bin/kafka
1 file changed, 8 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/kafka
refs/changes/50/162150/1
diff --git a/debian/bin/kafka b/debian/bin/kafka
index b20dc9d..e020d1b 100755
--- a/debian/bin/kafka
+++ b/debian/bin/kafka
@@ -60,6 +60,7 @@
KAFKA_JVM_PERFORMANCE_OPTS - Any special JVM perfomance options. This is
set by default.
KAFKA_HEAP_OPTS - Any special JVM memory heap options. This is
set by default.
KAFKA_LOG4J_OPTS - Any log4j options. Especially
-Dlog4j.configuration. This is set by default.
+ JAVA_OPTS - Any extra JVM options.
KAFKA_OPTS - Any extra options you want to pass.
"
@@ -112,6 +113,11 @@
KAFKA_JVM_PERFORMANCE_OPTS="-server -XX:+UseCompressedOops
-XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled
-XX:+CMSScavengeBeforeRemark -XX:+DisableExplicitGC -Djava.awt.headless=true"
fi
+ # Other Java options
+ if [ -z "$JAVA_OPTS" ]; then
+ JAVA_OPTS=""
+ fi
+
while [ $# -gt 0 ]; do
COMMAND=$1
case $COMMAND in
@@ -149,9 +155,9 @@
# Launch mode
if [ "x$DAEMON_MODE" = "xtrue" ]; then
- nohup $JAVA $KAFKA_HEAP_OPTS $KAFKA_JVM_PERFORMANCE_OPTS
$KAFKA_GC_LOG_OPTS $KAFKA_JMX_OPTS $KAFKA_LOG4J_OPTS -cp $CLASSPATH $KAFKA_OPTS
"$@" > "$CONSOLE_OUTPUT_FILE" 2>&1 < /dev/null &
+ nohup $JAVA $KAFKA_HEAP_OPTS $KAFKA_JVM_PERFORMANCE_OPTS
$KAFKA_GC_LOG_OPTS $KAFKA_JMX_OPTS $KAFKA_LOG4J_OPTS $JAVA_OPTS -cp $CLASSPATH
$KAFKA_OPTS "$@" > "$CONSOLE_OUTPUT_FILE" 2>&1 < /dev/null &
else
- exec $JAVA $KAFKA_HEAP_OPTS $KAFKA_JVM_PERFORMANCE_OPTS
$KAFKA_GC_LOG_OPTS $KAFKA_JMX_OPTS $KAFKA_LOG4J_OPTS -cp $CLASSPATH $KAFKA_OPTS
"$@"
+ exec $JAVA $KAFKA_HEAP_OPTS $KAFKA_JVM_PERFORMANCE_OPTS
$KAFKA_GC_LOG_OPTS $KAFKA_JMX_OPTS $KAFKA_LOG4J_OPTS $JAVA_OPTS -cp $CLASSPATH
$KAFKA_OPTS "$@"
fi
}
--
To view, visit https://gerrit.wikimedia.org/r/162150
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a1879f1c707f9f0e3e5086729c42ddffb290034
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/kafka
Gerrit-Branch: master
Gerrit-Owner: Plucas <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
