Skip to content

KAFKA-10138: Prefer --bootstrap-server for reassign_partitions command in ducktape tests #8898

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
cmccabe merged 1 commit into from
Jun 19, 2020
Merged

KAFKA-10138: Prefer --bootstrap-server for reassign_partitions command in ducktape tests #8898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions tests/kafkatest/services/kafka/kafka.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,6 +593,13 @@ def parse_describe_topic(self, topic_description):
"replicas": map(int, fields[3].split(','))})
return {"partitions": partitions}


def _connect_setting_reassign_partitions(self, node):
if node.version.reassign_partitions_command_supports_bootstrap_server():
return "--bootstrap-server %s " % self.bootstrap_servers(self.security_protocol)
else:
return "--zookeeper %s " % self.zk_connect_setting()

def verify_reassign_partitions(self, reassignment, node=None):
"""Run the reassign partitions admin tool in "verify" mode
"""
Expand All @@ -609,7 +616,7 @@ def verify_reassign_partitions(self, reassignment, node=None):
cmd = fix_opts_for_new_jvm(node)
cmd += "echo %s > %s && " % (json_str, json_file)
cmd += "%s " % self.path.script("kafka-reassign-partitions.sh", node)
cmd += "--zookeeper %s " % self.zk_connect_setting()
cmd += self._connect_setting_reassign_partitions(node)
cmd += "--reassignment-json-file %s " % json_file
cmd += "--verify "
cmd += "&& sleep 1 && rm -f %s" % json_file
Expand Down Expand Up @@ -649,7 +656,7 @@ def execute_reassign_partitions(self, reassignment, node=None,
cmd = fix_opts_for_new_jvm(node)
cmd += "echo %s > %s && " % (json_str, json_file)
cmd += "%s " % self.path.script( "kafka-reassign-partitions.sh", node)
cmd += "--zookeeper %s " % self.zk_connect_setting()
cmd += self._connect_setting_reassign_partitions(node)
cmd += "--reassignment-json-file %s " % json_file
cmd += "--execute"
if throttle is not None:
Expand Down
7 changes: 7 additions & 0 deletions tests/kafkatest/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ def supports_tls_to_zookeeper(self):
# indicate if KIP-515 is available
return self > LATEST_2_4

def reassign_partitions_command_supports_bootstrap_server(self):
return self >= V_2_5_0

def get_version(node=None):
"""Return the version attached to the given node.
Default to DEV_BRANCH if node or node.version is undefined (aka None)
Expand Down Expand Up @@ -147,3 +150,7 @@ def get_version(node=None):
# 2.5.x versions
V_2_5_0 = KafkaVersion("2.5.0")
LATEST_2_5 = V_2_5_0

# 2.6.x versions
V_2_6_0 = KafkaVersion("2.6.0")
LATEST_2_6 = V_2_6_0