Skip to content

MINOR: Account for different versions in upgrade #6835

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bbejeck merged 3 commits into from
May 29, 2019
Merged

MINOR: Account for different versions in upgrade #6835

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
864995f
MINOR: Genericize the dev version to just look for SNAPSHOT
bbejeck May 28, 2019
e66a86d
MINOR: Fix pattern
bbejeck May 28, 2019
c4b2a0a
MINOR: tighten the bounds for matching
bbejeck May 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion tests/kafkatest/tests/streams/streams_upgrade_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ def __init__(self, test_context):
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")
Expand Down Expand Up @@ -368,6 +369,8 @@ def get_version_string(self, version):
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

Expand Down Expand Up @@ -536,7 +539,8 @@ def do_rolling_bounce(self, processor, counter, current_generation):
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))

@cadonna cadonna May 29, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't str(DEV_VERSION) in the error message also be changed?

@bbejeck bbejeck May 29, 2019

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wanted to leave the str(DEV_VERSION) as is so it's more clear in the logs if an error occurs

log_monitor.offset = 5
Expand Down