This is an automated email from the ASF dual-hosted git repository.
chia7712 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new 1c3ee7fe60b KAFKA-18004 Use version 3.8 to run the ZooKeeper service
for end-to-end tests (#17790)
1c3ee7fe60b is described below
commit 1c3ee7fe60b8e6ae6aca9415a91134f0ec022843
Author: PoAn Yang <[email protected]>
AuthorDate: Wed Nov 13 20:34:53 2024 +0800
KAFKA-18004 Use version 3.8 to run the ZooKeeper service for end-to-end
tests (#17790)
We plan to remove all ZooKeeper-related code in version 4.0. However, some
old brokers in the end-to-end tests still require ZooKeeper service, so we need
to run the ZooKeeper service using the 3.x release instead of the dev branch.
Since version 3.9 is not available in the
https://s3-us-west-2.amazonaws.com/kafka-packages repo, we can use version 3.8
for now.
Reviewers: Chia-Ping Tsai <[email protected]>
---
tests/kafkatest/services/zookeeper.py | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/tests/kafkatest/services/zookeeper.py
b/tests/kafkatest/services/zookeeper.py
index 9c9e8c35a44..49eaf741bb3 100644
--- a/tests/kafkatest/services/zookeeper.py
+++ b/tests/kafkatest/services/zookeeper.py
@@ -23,7 +23,7 @@ from ducktape.cluster.remoteaccount import RemoteCommandError
from kafkatest.directory_layout.kafka_path import KafkaPathResolverMixin
from kafkatest.services.security.security_config import SecurityConfig
-from kafkatest.version import DEV_BRANCH
+from kafkatest.version import LATEST_3_8
class ZookeeperService(KafkaPathResolverMixin, Service):
@@ -43,8 +43,9 @@ class ZookeeperService(KafkaPathResolverMixin, Service):
"collect_default": True}
}
+ # After 4.0, zookeeper service is removed from source code. Using
LATEST_3_8 for compatibility test cases.
def __init__(self, context, num_nodes, zk_sasl = False, zk_client_port =
True, zk_client_secure_port = False,
- zk_tls_encrypt_only = False, version=DEV_BRANCH):
+ zk_tls_encrypt_only = False, version=LATEST_3_8):
"""
:type context
"""
@@ -186,7 +187,7 @@ class ZookeeperService(KafkaPathResolverMixin, Service):
chroot_path = ('' if chroot is None else chroot) + path
- kafka_run_class = self.path.script("kafka-run-class.sh", DEV_BRANCH)
+ kafka_run_class = self.path.script("kafka-run-class.sh", LATEST_3_8)
cmd = "%s %s -server %s %s get %s" % \
(kafka_run_class, self.java_cli_class_name(),
self.connect_setting(force_tls=self.zk_client_secure_port),
self.zkTlsConfigFileOption(True),
@@ -211,7 +212,7 @@ class ZookeeperService(KafkaPathResolverMixin, Service):
chroot_path = ('' if chroot is None else chroot) + path
- kafka_run_class = self.path.script("kafka-run-class.sh", DEV_BRANCH)
+ kafka_run_class = self.path.script("kafka-run-class.sh", LATEST_3_8)
cmd = "%s %s -server %s %s ls %s" % \
(kafka_run_class, self.java_cli_class_name(),
self.connect_setting(force_tls=self.zk_client_secure_port),
self.zkTlsConfigFileOption(True),
@@ -239,7 +240,7 @@ class ZookeeperService(KafkaPathResolverMixin, Service):
chroot_path = ('' if chroot is None else chroot) + path
- kafka_run_class = self.path.script("kafka-run-class.sh", DEV_BRANCH)
+ kafka_run_class = self.path.script("kafka-run-class.sh", LATEST_3_8)
if recursive:
op = "deleteall"
else:
@@ -261,7 +262,7 @@ class ZookeeperService(KafkaPathResolverMixin, Service):
chroot_path = ('' if chroot is None else chroot) + path
- kafka_run_class = self.path.script("kafka-run-class.sh", DEV_BRANCH)
+ kafka_run_class = self.path.script("kafka-run-class.sh", LATEST_3_8)
cmd = "%s %s -server %s %s create %s '%s'" % \
(kafka_run_class, self.java_cli_class_name(),
self.connect_setting(force_tls=self.zk_client_secure_port),
self.zkTlsConfigFileOption(True),
@@ -275,7 +276,7 @@ class ZookeeperService(KafkaPathResolverMixin, Service):
Describe the default user using the ConfigCommand CLI
"""
- kafka_run_class = self.path.script("kafka-run-class.sh", DEV_BRANCH)
+ kafka_run_class = self.path.script("kafka-run-class.sh", LATEST_3_8)
cmd = "%s kafka.admin.ConfigCommand --zookeeper %s %s --describe
--entity-type users --entity-default" % \
(kafka_run_class,
self.connect_setting(force_tls=self.zk_client_secure_port),
self.zkTlsConfigFileOption())
