root
/
kafka
mirror of https://github.com/apache/kafka.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

MINOR: Fix kafkatest advertised listeners (#17294) 

Followup for #17146

Reviewers: Bill Bejeck <bbejeck@apache.org>
This commit is contained in:
Alyssa Huang 2024-09-30 05:51:49 -07:00 committed by José Armando García Sancio
parent edd77c1e25
commit 5c95a5da31
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/kafkatest/services/kafka/kafka.py
View File

@ -280,6 +280,7 @@ class KafkaService(KafkaPathResolverMixin, JmxMixin, Service):
self.controller_quorum = None # will define below if necessary self.controller_quorum = None # will define below if necessary
self.isolated_controller_quorum = None # will define below if necessary self.isolated_controller_quorum = None # will define below if necessary
self.configured_for_zk_migration = False self.configured_for_zk_migration = False
self.dynamicRaftQuorum = False
# Set use_new_coordinator based on context and arguments. # Set use_new_coordinator based on context and arguments.
default_use_new_coordinator = False default_use_new_coordinator = False
@ -761,6 +762,8 @@ class KafkaService(KafkaPathResolverMixin, JmxMixin, Service):
for port in self.port_mappings.values(): for port in self.port_mappings.values():
if port.open: if port.open:
listeners.append(port.listener()) listeners.append(port.listener())
if (self.dynamicRaftQuorum and quorum.NodeQuorumInfo(self.quorum_info, node).has_controller_role) or \
port.name not in controller_listener_names:
advertised_listeners.append(port.advertised_listener(node)) advertised_listeners.append(port.advertised_listener(node))
protocol_map.append(port.listener_security_protocol()) protocol_map.append(port.listener_security_protocol())
controller_sec_protocol = self.isolated_controller_quorum.controller_security_protocol if self.isolated_controller_quorum \ controller_sec_protocol = self.isolated_controller_quorum.controller_security_protocol if self.isolated_controller_quorum \
@ -881,16 +884,18 @@ class KafkaService(KafkaPathResolverMixin, JmxMixin, Service):
# define controller.quorum.bootstrap.servers or controller.quorum.voters text # define controller.quorum.bootstrap.servers or controller.quorum.voters text
security_protocol_to_use = self.controller_quorum.controller_security_protocol security_protocol_to_use = self.controller_quorum.controller_security_protocol
first_node_id = 1 if self.quorum_info.has_brokers_and_controllers else config_property.FIRST_CONTROLLER_ID first_node_id = 1 if self.quorum_info.has_brokers_and_controllers else config_property.FIRST_CONTROLLER_ID
controller_quorum_bootstrap_servers = ','.join(["{}:{}".format(node.account.hostname, if self.dynamicRaftQuorum:
self.controller_quorum_bootstrap_servers = ','.join(["{}:{}".format(node.account.hostname,
config_property.FIRST_CONTROLLER_PORT + config_property.FIRST_CONTROLLER_PORT +
KafkaService.SECURITY_PROTOCOLS.index(security_protocol_to_use)) KafkaService.SECURITY_PROTOCOLS.index(security_protocol_to_use))
for node in self.controller_quorum.nodes[:self.controller_quorum.num_nodes_controller_role]]) for node in self.controller_quorum.nodes[:self.controller_quorum.num_nodes_controller_role]])
if self.dynamicRaftQuorum:
self.controller_quorum_bootstrap_servers = controller_quorum_bootstrap_servers
else: else:
self.controller_quorum_voters = ','.join(["%s@%s" % (self.controller_quorum.idx(node) + first_node_id - 1, self.controller_quorum_voters = ','.join(["{}@{}:{}".format(self.controller_quorum.idx(node) +
bootstrap_server) first_node_id - 1,
for bootstrap_server in controller_quorum_bootstrap_servers.split(',')]) node.account.hostname,
config_property.FIRST_CONTROLLER_PORT +
KafkaService.SECURITY_PROTOCOLS.index(security_protocol_to_use))
for node in self.controller_quorum.nodes[:self.controller_quorum.num_nodes_controller_role]])
# define controller.listener.names # define controller.listener.names
self.controller_listener_names = ','.join(self.controller_listener_name_list(node)) self.controller_listener_names = ','.join(self.controller_listener_name_list(node))
# define sasl.mechanism.controller.protocol to match the isolated quorum if one exists # define sasl.mechanism.controller.protocol to match the isolated quorum if one exists