This is an automated email from the ASF dual-hosted git repository.
ijuma 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 48527a1e7fe MINOR: Clean-up imports, imports and unused parameter in
upgrade_test.py (#19018)
48527a1e7fe is described below
commit 48527a1e7fe82a9833fc496b84191ef6f01241aa
Author: Ismael Juma <[email protected]>
AuthorDate: Mon Feb 24 06:35:07 2025 -0800
MINOR: Clean-up imports, imports and unused parameter in upgrade_test.py
(#19018)
Reviewers: Chia-Ping Tsai <[email protected]>
---
tests/kafkatest/tests/core/upgrade_test.py | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/tests/kafkatest/tests/core/upgrade_test.py
b/tests/kafkatest/tests/core/upgrade_test.py
index dd29b7375e4..30997aabf71 100644
--- a/tests/kafkatest/tests/core/upgrade_test.py
+++ b/tests/kafkatest/tests/core/upgrade_test.py
@@ -22,15 +22,14 @@ from kafkatest.services.kafka.quorum import isolated_kraft,
combined_kraft
from kafkatest.services.verifiable_producer import VerifiableProducer
from kafkatest.tests.produce_consume_validate import ProduceConsumeValidateTest
from kafkatest.utils import is_int
-from kafkatest.version import LATEST_3_1, LATEST_3_2, LATEST_3_3, LATEST_3_4,
LATEST_3_5, \
+from kafkatest.version import LATEST_3_3, LATEST_3_4, LATEST_3_5, \
LATEST_3_6, LATEST_3_7, LATEST_3_8, LATEST_3_9, DEV_BRANCH, KafkaVersion,
LATEST_STABLE_METADATA_VERSION
#
# Test upgrading between different KRaft versions.
#
-# Note that the earliest supported KRaft version is 3.0, not 0.8 as it is for
-# ZK mode. The upgrade process is also somewhat different for KRaft because we
-# use metadata.version instead of inter.broker.protocol.
+# The earliest supported version to ugrade from is `3.3` - the first KRaft
version deemed production-ready
+# and also when KIP-778 (KRaft to KRaft upgrades) landed.
#
class TestUpgrade(ProduceConsumeValidateTest):
@@ -53,7 +52,7 @@ class TestUpgrade(ProduceConsumeValidateTest):
wait_until(lambda: len(self.kafka.isr_idx_list(self.topic,
partition)) == self.replication_factor, timeout_sec=60,
backoff_sec=1, err_msg="Replicas did not rejoin the ISR in
a reasonable amount of time")
- def upgrade_to_dev_version(self, from_kafka_version,
update_metadata_version):
+ def upgrade_to_dev_version(self, update_metadata_version):
self.logger.info("Performing rolling upgrade.")
for node in self.kafka.controller_quorum.nodes:
self.logger.info("Stopping controller node %s" %
node.account.hostname)
@@ -123,7 +122,7 @@ class TestUpgrade(ProduceConsumeValidateTest):
self.topic, consumer_timeout_ms=30000,
message_validator=is_int,
version=KafkaVersion(from_kafka_version))
- self.run_produce_consume_validate(core_test_action=lambda:
self.upgrade_to_dev_version(from_kafka_version, True))
+ self.run_produce_consume_validate(core_test_action=lambda:
self.upgrade_to_dev_version(True))
cluster_id = self.kafka.cluster_id()
assert cluster_id is not None
assert len(cluster_id) == 22
@@ -164,7 +163,7 @@ class TestUpgrade(ProduceConsumeValidateTest):
self.consumer = ConsoleConsumer(self.test_context, self.num_consumers,
self.kafka,
self.topic, consumer_timeout_ms=30000,
message_validator=is_int,
version=KafkaVersion(starting_kafka_version))
- self.upgrade_to_dev_version(starting_kafka_version, False)
+ self.upgrade_to_dev_version(False)
self.run_produce_consume_validate(core_test_action=lambda:
self.downgrade_to_version(starting_kafka_version))
cluster_id = self.kafka.cluster_id()
@@ -194,4 +193,4 @@ class TestUpgrade(ProduceConsumeValidateTest):
@matrix(from_kafka_version=[str(LATEST_3_3), str(LATEST_3_4),
str(LATEST_3_5), str(LATEST_3_6), str(LATEST_3_7), str(LATEST_3_8),
str(LATEST_3_9), str(DEV_BRANCH)],
metadata_quorum=[isolated_kraft])
def test_isolated_mode_upgrade_downgrade(self, from_kafka_version,
metadata_quorum, use_new_coordinator=False):
- self.run_upgrade_downgrade(from_kafka_version)
\ No newline at end of file
+ self.run_upgrade_downgrade(from_kafka_version)
