This is an automated email from the ASF dual-hosted git repository.
showuon pushed a commit to branch 3.8
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/3.8 by this push:
new 26763c52682 MINOR: use 2 logdirs in ZK migration system tests (#15394)
26763c52682 is described below
commit 26763c526824bee505a118c3def190da8fa4c5dc
Author: Gaurav Narula <gaurav_naru...@apple.com>
AuthorDate: Tue Jun 18 11:49:25 2024 +0100
MINOR: use 2 logdirs in ZK migration system tests (#15394)
Zookeeper migration system tests currently override the config to
use only one log directory.
This PR removes the override so that the system tests run with 2 log
directories following the work done as part of KIP-858.
Reviewers: Igor Soarez <soa...@apple.com>, Proven Provenzano
<pprovenz...@confluent.io>
---
tests/kafkatest/tests/core/zookeeper_migration_test.py | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/tests/kafkatest/tests/core/zookeeper_migration_test.py
b/tests/kafkatest/tests/core/zookeeper_migration_test.py
index 7ca1c6a8ec5..530179da5b9 100644
--- a/tests/kafkatest/tests/core/zookeeper_migration_test.py
+++ b/tests/kafkatest/tests/core/zookeeper_migration_test.py
@@ -23,7 +23,7 @@ from ducktape.errors import TimeoutError
from kafkatest.services.console_consumer import ConsoleConsumer
from kafkatest.services.kafka import KafkaService
-from kafkatest.services.kafka.config_property import CLUSTER_ID, LOG_DIRS
+from kafkatest.services.kafka.config_property import CLUSTER_ID
from kafkatest.services.kafka.quorum import isolated_kraft, ServiceQuorumInfo,
zk
from kafkatest.services.verifiable_producer import VerifiableProducer
from kafkatest.services.zookeeper import ZookeeperService
@@ -58,8 +58,7 @@ class TestMigration(ProduceConsumeValidateTest):
allow_zk_with_kraft=True,
isolated_kafka=self.kafka,
server_prop_overrides=[["zookeeper.connect",
self.zk.connect_setting()],
-
["zookeeper.metadata.migration.enable", "true"],
- [LOG_DIRS,
KafkaService.DATA_LOG_DIR_1]],
+
["zookeeper.metadata.migration.enable", "true"]],
quorum_info_provider=remote_quorum)
controller.start()
@@ -100,7 +99,6 @@ class TestMigration(ProduceConsumeValidateTest):
allow_zk_with_kraft=True,
server_prop_overrides=[
["zookeeper.metadata.migration.enable",
"false"],
- [LOG_DIRS, KafkaService.DATA_LOG_DIR_1]
])
self.kafka.security_protocol = "PLAINTEXT"
self.kafka.interbroker_security_protocol = "PLAINTEXT"
@@ -157,7 +155,6 @@ class TestMigration(ProduceConsumeValidateTest):
version=LATEST_3_4,
server_prop_overrides=[
["zookeeper.metadata.migration.enable",
"false"],
- [LOG_DIRS, KafkaService.DATA_LOG_DIR_1]
],
topics={self.topic: {"partitions":
self.partitions,
"replication-factor":
self.replication_factor,
@@ -222,7 +219,6 @@ class TestMigration(ProduceConsumeValidateTest):
allow_zk_with_kraft=True,
server_prop_overrides=[
["zookeeper.metadata.migration.enable",
"true"],
- [LOG_DIRS, KafkaService.DATA_LOG_DIR_1]
])
remote_quorum = partial(ServiceQuorumInfo, isolated_kraft)
@@ -230,8 +226,7 @@ class TestMigration(ProduceConsumeValidateTest):
allow_zk_with_kraft=True,
isolated_kafka=self.kafka,
server_prop_overrides=[["zookeeper.connect",
self.zk.connect_setting()],
-
["zookeeper.metadata.migration.enable", "true"],
- [LOG_DIRS,
KafkaService.DATA_LOG_DIR_1]],
+
["zookeeper.metadata.migration.enable", "true"]],
quorum_info_provider=remote_quorum)
self.kafka.security_protocol = "PLAINTEXT"
@@ -301,16 +296,14 @@ class TestMigration(ProduceConsumeValidateTest):
quorum_info_provider=zk_quorum,
allow_zk_with_kraft=True,
server_prop_overrides=[
- ["zookeeper.metadata.migration.enable",
"false"],
- [LOG_DIRS, KafkaService.DATA_LOG_DIR_1]])
+ ["zookeeper.metadata.migration.enable",
"false"]])
remote_quorum = partial(ServiceQuorumInfo, isolated_kraft)
controller = KafkaService(self.test_context, num_nodes=1, zk=self.zk,
version=DEV_BRANCH,
allow_zk_with_kraft=True,
isolated_kafka=self.kafka,
server_prop_overrides=[["zookeeper.connect",
self.zk.connect_setting()],
-
["zookeeper.metadata.migration.enable", "true"],
- [LOG_DIRS,
KafkaService.DATA_LOG_DIR_1]],
+
["zookeeper.metadata.migration.enable", "true"]],
quorum_info_provider=remote_quorum)
self.kafka.security_protocol = "PLAINTEXT"
