You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by bb...@apache.org on 2019/05/29 21:02:58 UTC
[kafka] branch trunk updated: MINOR: Account for different versions
in upgrade (#6835)
This is an automated email from the ASF dual-hosted git repository.
bbejeck 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 f249956 MINOR: Account for different versions in upgrade (#6835)
f249956 is described below
commit f249956390c051c92ebb090a61933dd08c522861
Author: Bill Bejeck <bb...@gmail.com>
AuthorDate: Wed May 29 17:02:37 2019 -0400
MINOR: Account for different versions in upgrade (#6835)
Reviewers: Guozhang Wang <wa...@gmail.com>, Bruno Cadonna <br...@confluent.io>
---
tests/kafkatest/tests/streams/streams_upgrade_test.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tests/kafkatest/tests/streams/streams_upgrade_test.py b/tests/kafkatest/tests/streams/streams_upgrade_test.py
index 4cb8bb6..d7a4548 100644
--- a/tests/kafkatest/tests/streams/streams_upgrade_test.py
+++ b/tests/kafkatest/tests/streams/streams_upgrade_test.py
@@ -89,6 +89,7 @@ class StreamsUpgradeTest(Test):
self.leader_counter = {}
processed_msg = "processed [0-9]* records"
+ base_version_number = str(DEV_VERSION).split("-")[0]
def perform_broker_upgrade(self, to_version):
self.logger.info("First pass bounce - rolling broker upgrade")
@@ -368,6 +369,8 @@ class StreamsUpgradeTest(Test):
if version.startswith("0") or version.startswith("1") \
or version.startswith("2.0") or version.startswith("2.1"):
return "Kafka version : " + version
+ elif "SNAPSHOT" in version:
+ return "Kafka version.*" + self.base_version_number + ".*SNAPSHOT"
else:
return "Kafka version: " + version
@@ -536,7 +539,8 @@ class StreamsUpgradeTest(Test):
self.old_processors.remove(processor)
self.upgraded_processors.append(processor)
- log_monitor.wait_until("Kafka version: " + str(DEV_VERSION),
+ # checking for the dev version which should be the only SNAPSHOT
+ log_monitor.wait_until("Kafka version.*" + self.base_version_number + ".*SNAPSHOT",
timeout_sec=60,
err_msg="Could not detect Kafka Streams version " + str(DEV_VERSION) + " in " + str(node.account))
log_monitor.offset = 5