You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by kk...@apache.org on 2020/04/13 17:59:06 UTC
[kafka] branch 2.4 updated (5b97467 -> 51b8f26)
This is an automated email from the ASF dual-hosted git repository.
kkarantasis pushed a change to branch 2.4
in repository https://gitbox.apache.org/repos/asf/kafka.git.
from 5b97467 KAFKA-9835; Protect `FileRecords.slice` from concurrent write (#8451)
new efc131a [MINOR] allow additional JVM args in KafkaService (#7297)
new 51b8f26 Fix missing reference in kafka.py (#7715)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
tests/kafkatest/services/kafka/kafka.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
[kafka] 01/02: [MINOR] allow additional JVM args in KafkaService
(#7297)
Posted by kk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kkarantasis pushed a commit to branch 2.4
in repository https://gitbox.apache.org/repos/asf/kafka.git
commit efc131ab14609b280771545de0d6fcd182aed1d4
Author: Brian Bushree <bb...@confluent.io>
AuthorDate: Mon Nov 18 10:50:36 2019 -0800
[MINOR] allow additional JVM args in KafkaService (#7297)
Reviewers: Colin P. McCabe <cm...@apache.org>, Vikas Singh <vi...@confluent.io>
---
tests/kafkatest/services/kafka/kafka.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/tests/kafkatest/services/kafka/kafka.py b/tests/kafkatest/services/kafka/kafka.py
index e71ed7c..9afb622 100644
--- a/tests/kafkatest/services/kafka/kafka.py
+++ b/tests/kafkatest/services/kafka/kafka.py
@@ -96,7 +96,7 @@ class KafkaService(KafkaPathResolverMixin, JmxMixin, Service):
client_sasl_mechanism=SecurityConfig.SASL_MECHANISM_GSSAPI, interbroker_sasl_mechanism=SecurityConfig.SASL_MECHANISM_GSSAPI,
authorizer_class_name=None, topics=None, version=DEV_BRANCH, jmx_object_names=None,
jmx_attributes=None, zk_connect_timeout=5000, zk_session_timeout=6000, server_prop_overides=None, zk_chroot=None,
- listener_security_config=ListenerSecurityConfig(), per_node_server_prop_overrides={}):
+ listener_security_config=ListenerSecurityConfig(), per_node_server_prop_overrides={}, extra_kafka_opts=""):
"""
:param context: test context
:param ZookeeperService zk:
@@ -114,6 +114,8 @@ class KafkaService(KafkaPathResolverMixin, JmxMixin, Service):
:param dict server_prop_overides: overrides for kafka.properties file
:param zk_chroot:
:param ListenerSecurityConfig listener_security_config: listener config to use
+ :param dict per_node_server_prop_overrides:
+ :param str extra_kafka_opts: jvm args to add to KAFKA_OPTS variable
"""
Service.__init__(self, context, num_nodes)
JmxMixin.__init__(self, num_nodes=num_nodes, jmx_object_names=jmx_object_names, jmx_attributes=(jmx_attributes or []),
@@ -138,6 +140,7 @@ class KafkaService(KafkaPathResolverMixin, JmxMixin, Service):
self.log_level = "DEBUG"
self.zk_chroot = zk_chroot
self.listener_security_config = listener_security_config
+ self.extra_kafka_opts = extra_kafka_opts
#
# In a heavily loaded and not very fast machine, it is
@@ -325,8 +328,8 @@ class KafkaService(KafkaPathResolverMixin, JmxMixin, Service):
cmd += "export KAFKA_LOG4J_OPTS=\"-Dlog4j.configuration=file:%s\"; " % self.LOG4J_CONFIG
heap_kafka_opts = "-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=%s" % \
self.logs["kafka_heap_dump_file"]["path"]
- other_kafka_opts = self.security_config.kafka_opts.strip('\"')
- cmd += "export KAFKA_OPTS=\"%s %s\"; " % (heap_kafka_opts, other_kafka_opts)
+ security_kafka_opts = self.security_config.kafka_opts.strip('\"')
+ cmd += "export KAFKA_OPTS=\"%s %s %s\"; " % (heap_kafka_opts, security_kafka_opts, extra_kafka_opts)
cmd += "%s %s 1>> %s 2>> %s &" % \
(self.path.script("kafka-server-start.sh", node),
KafkaService.CONFIG_FILE,
[kafka] 02/02: Fix missing reference in kafka.py (#7715)
Posted by kk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kkarantasis pushed a commit to branch 2.4
in repository https://gitbox.apache.org/repos/asf/kafka.git
commit 51b8f26e2c4629b6a737cbc84c2203f19647bf0b
Author: David Arthur <mu...@gmail.com>
AuthorDate: Tue Nov 19 15:19:48 2019 -0500
Fix missing reference in kafka.py (#7715)
Also fix a default value for a dictionary arg
---
tests/kafkatest/services/kafka/kafka.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/kafkatest/services/kafka/kafka.py b/tests/kafkatest/services/kafka/kafka.py
index 9afb622..b26afcf 100644
--- a/tests/kafkatest/services/kafka/kafka.py
+++ b/tests/kafkatest/services/kafka/kafka.py
@@ -96,7 +96,7 @@ class KafkaService(KafkaPathResolverMixin, JmxMixin, Service):
client_sasl_mechanism=SecurityConfig.SASL_MECHANISM_GSSAPI, interbroker_sasl_mechanism=SecurityConfig.SASL_MECHANISM_GSSAPI,
authorizer_class_name=None, topics=None, version=DEV_BRANCH, jmx_object_names=None,
jmx_attributes=None, zk_connect_timeout=5000, zk_session_timeout=6000, server_prop_overides=None, zk_chroot=None,
- listener_security_config=ListenerSecurityConfig(), per_node_server_prop_overrides={}, extra_kafka_opts=""):
+ listener_security_config=ListenerSecurityConfig(), per_node_server_prop_overrides=None, extra_kafka_opts=""):
"""
:param context: test context
:param ZookeeperService zk:
@@ -329,7 +329,7 @@ class KafkaService(KafkaPathResolverMixin, JmxMixin, Service):
heap_kafka_opts = "-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=%s" % \
self.logs["kafka_heap_dump_file"]["path"]
security_kafka_opts = self.security_config.kafka_opts.strip('\"')
- cmd += "export KAFKA_OPTS=\"%s %s %s\"; " % (heap_kafka_opts, security_kafka_opts, extra_kafka_opts)
+ cmd += "export KAFKA_OPTS=\"%s %s %s\"; " % (heap_kafka_opts, security_kafka_opts, self.extra_kafka_opts)
cmd += "%s %s 1>> %s 2>> %s &" % \
(self.path.script("kafka-server-start.sh", node),
KafkaService.CONFIG_FILE,