This is an automated email from the ASF dual-hosted git repository.
rsivaram 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 933370c KAFKA-9797; Fix
TestSecurityRollingUpgrade.test_enable_separate_interbroker_listener (#8403)
933370c is described below
commit 933370c39ea4c159fa546513913249e95d37b882
Author: Rajini Sivaram <rajinisiva...@googlemail.com>
AuthorDate: Wed Apr 15 13:04:11 2020 +0100
KAFKA-9797; Fix
TestSecurityRollingUpgrade.test_enable_separate_interbroker_listener (#8403)
Reviewers: Manikumar Reddy <manikumar.re...@gmail.com>, Ismael Juma
<ism...@juma.me.uk>
---
tests/kafkatest/tests/core/security_rolling_upgrade_test.py | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/tests/kafkatest/tests/core/security_rolling_upgrade_test.py
b/tests/kafkatest/tests/core/security_rolling_upgrade_test.py
index 3c63ec7..853bed2 100644
--- a/tests/kafkatest/tests/core/security_rolling_upgrade_test.py
+++ b/tests/kafkatest/tests/core/security_rolling_upgrade_test.py
@@ -96,10 +96,15 @@ class
TestSecurityRollingUpgrade(ProduceConsumeValidateTest):
self.set_authorizer_and_bounce(security_protocol, security_protocol,
KafkaService.SIMPLE_AUTHORIZER)
def add_separate_broker_listener(self, broker_security_protocol,
broker_sasl_mechanism):
+ # Enable the new internal listener on all brokers first
+ self.kafka.open_port(self.kafka.INTERBROKER_LISTENER_NAME)
+
self.kafka.port_mappings[self.kafka.INTERBROKER_LISTENER_NAME].security_protocol
= broker_security_protocol
+ self.kafka.client_sasl_mechanism = broker_sasl_mechanism
+ self.bounce()
+
+ # Update inter-broker listener after all brokers have been updated to
enable the new listener
self.kafka.setup_interbroker_listener(broker_security_protocol, True)
self.kafka.interbroker_sasl_mechanism = broker_sasl_mechanism
- # kafka opens interbroker port automatically in start() but not in
bounce()
- self.kafka.open_port(self.kafka.INTERBROKER_LISTENER_NAME)
self.bounce()
def remove_separate_broker_listener(self, client_security_protocol,
client_sasl_mechanism):
