You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by vv...@apache.org on 2020/07/10 02:32:56 UTC
[kafka] branch 2.5 updated: MINOR: prune the metadata upgrade test
matrix (#8971)
This is an automated email from the ASF dual-hosted git repository.
vvcephei pushed a commit to branch 2.5
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/2.5 by this push:
new 8d810bf MINOR: prune the metadata upgrade test matrix (#8971)
8d810bf is described below
commit 8d810bf135d2d46a2362aad6e09dd9f50db742ab
Author: John Roesler <vv...@users.noreply.github.com>
AuthorDate: Mon Jul 6 18:52:51 2020 -0500
MINOR: prune the metadata upgrade test matrix (#8971)
Most of the values in the metadata upgrade test matrix are just testing
the upgrade/downgrade path between two previous releases. This is
unnecessary. We run the tests for all supported branches, so what we
should test is the up-/down-gradability of released versions with respect
to the current branch.
Reviewers: Guozhang Wang <wa...@gmail.com>
---
.../tests/streams/streams_upgrade_test.py | 57 +---------------------
1 file changed, 2 insertions(+), 55 deletions(-)
diff --git a/tests/kafkatest/tests/streams/streams_upgrade_test.py b/tests/kafkatest/tests/streams/streams_upgrade_test.py
index dada19e..9c4da44 100644
--- a/tests/kafkatest/tests/streams/streams_upgrade_test.py
+++ b/tests/kafkatest/tests/streams/streams_upgrade_test.py
@@ -33,10 +33,6 @@ broker_upgrade_versions = [str(LATEST_0_10_1), str(LATEST_0_10_2), str(LATEST_0_
metadata_1_versions = [str(LATEST_0_10_0)]
metadata_2_versions = [str(LATEST_0_10_1), str(LATEST_0_10_2), str(LATEST_0_11_0), str(LATEST_1_0), str(LATEST_1_1)]
-# once 0.10.1.2 is available backward_compatible_metadata_2_versions
-# can be replaced with metadata_2_versions
-backward_compatible_metadata_2_versions = [str(LATEST_0_10_2), str(LATEST_0_11_0), str(LATEST_1_0), str(LATEST_1_1)]
-metadata_3_or_higher_versions = [str(LATEST_2_0), str(LATEST_2_1), str(LATEST_2_2), str(LATEST_2_3), str(LATEST_2_4), str(DEV_VERSION)]
"""
After each release one should first check that the released version has been uploaded to
@@ -189,57 +185,8 @@ class StreamsUpgradeTest(Test):
processor.stop()
processor.node.account.ssh_capture("grep SMOKE-TEST-CLIENT-CLOSED %s" % processor.STDOUT_FILE, allow_fail=False)
- @matrix(from_version=metadata_2_versions, to_version=metadata_2_versions)
- def test_simple_upgrade_downgrade(self, from_version, to_version):
- """
- Starts 3 KafkaStreams instances with <old_version>, and upgrades one-by-one to <new_version>
- """
-
- if from_version == to_version:
- return
-
- self.zk = ZookeeperService(self.test_context, num_nodes=1)
- self.zk.start()
-
- self.kafka = KafkaService(self.test_context, num_nodes=1, zk=self.zk, topics=self.topics)
- self.kafka.start()
-
- self.driver = StreamsSmokeTestDriverService(self.test_context, self.kafka)
- self.driver.disable_auto_terminate()
- self.processor1 = StreamsUpgradeTestJobRunnerService(self.test_context, self.kafka)
- self.processor2 = StreamsUpgradeTestJobRunnerService(self.test_context, self.kafka)
- self.processor3 = StreamsUpgradeTestJobRunnerService(self.test_context, self.kafka)
-
- self.driver.start()
- self.start_all_nodes_with(from_version)
-
- self.processors = [self.processor1, self.processor2, self.processor3]
-
- counter = 1
- random.seed()
-
- # upgrade one-by-one via rolling bounce
- random.shuffle(self.processors)
- for p in self.processors:
- p.CLEAN_NODE_ENABLED = False
- self.do_stop_start_bounce(p, None, to_version, counter)
- counter = counter + 1
-
- # shutdown
- self.driver.stop()
-
- random.shuffle(self.processors)
- for p in self.processors:
- node = p.node
- with node.account.monitor_log(p.STDOUT_FILE) as monitor:
- p.stop()
- monitor.wait_until("UPGRADE-TEST-CLIENT-CLOSED",
- timeout_sec=60,
- err_msg="Never saw output 'UPGRADE-TEST-CLIENT-CLOSED' on" + str(node.account))
-
- @matrix(from_version=metadata_1_versions, to_version=backward_compatible_metadata_2_versions)
- @matrix(from_version=metadata_1_versions, to_version=metadata_3_or_higher_versions)
- @matrix(from_version=metadata_2_versions, to_version=metadata_3_or_higher_versions)
+ @matrix(from_version=metadata_1_versions, to_version=[str(DEV_VERSION)])
+ @matrix(from_version=metadata_2_versions, to_version=[str(DEV_VERSION)])
def test_metadata_upgrade(self, from_version, to_version):
"""
Starts 3 KafkaStreams instances with version <from_version> and upgrades one-by-one to <to_version>