This is an automated email from the ASF dual-hosted git repository. szaszm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
The following commit(s) were added to refs/heads/main by this push: new 63e213efe MINIFICPP-2356 Fix Kafka broker connection issue to Zookeeper 63e213efe is described below commit 63e213efeefae112e8094e2db7292bdb03fb6ce3 Author: Gabor Gyimesi <gamezb...@gmail.com> AuthorDate: Thu May 2 13:15:42 2024 +0200 MINIFICPP-2356 Fix Kafka broker connection issue to Zookeeper - Additionally update Zookeeper image version Closes #1777 Signed-off-by: Marton Szasz <sza...@apache.org> --- .../test/integration/cluster/containers/KafkaBrokerContainer.py | 8 +++++++- docker/test/integration/cluster/containers/ZookeeperContainer.py | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/docker/test/integration/cluster/containers/KafkaBrokerContainer.py b/docker/test/integration/cluster/containers/KafkaBrokerContainer.py index 13062cd36..03cfe599a 100644 --- a/docker/test/integration/cluster/containers/KafkaBrokerContainer.py +++ b/docker/test/integration/cluster/containers/KafkaBrokerContainer.py @@ -43,6 +43,7 @@ class KafkaBrokerContainer(Container): self.server_truststore_file.close() self.server_properties_file = tempfile.NamedTemporaryFile(delete=False) + self.feature_id = feature_context.id with open(os.environ['TEST_DIRECTORY'] + "/resources/kafka_broker/conf/server.properties") as server_properties_file: server_properties_content = server_properties_file.read() patched_server_properties_content = server_properties_content.replace("kafka-broker", f"kafka-broker-{feature_context.id}") @@ -65,6 +66,10 @@ class KafkaBrokerContainer(Container): name=self.name, network=self.network.name, ports={'9092/tcp': 9092, '29092/tcp': 29092, '9093/tcp': 9093, '29093/tcp': 29093, '9094/tcp': 9094, '29094/tcp': 29094, '9094/tcp': 9094, '29095/tcp': 29095}, + environment=[ + "ZOOKEEPER_HOST=zookeeper-" + self.feature_id, + "ZOOKEEPER_PORT=2181" + ], mounts=[ docker.types.Mount( type='bind', @@ -85,6 +90,7 @@ class KafkaBrokerContainer(Container): type='bind', source=self.server_truststore_file.name, target='/usr/local/etc/kafka/certs/server_truststore.pem' - )], + ) + ], entrypoint=self.command) logging.info('Added container \'%s\'', self.name) diff --git a/docker/test/integration/cluster/containers/ZookeeperContainer.py b/docker/test/integration/cluster/containers/ZookeeperContainer.py index 55829c78f..3fc383a2d 100644 --- a/docker/test/integration/cluster/containers/ZookeeperContainer.py +++ b/docker/test/integration/cluster/containers/ZookeeperContainer.py @@ -31,7 +31,7 @@ class ZookeeperContainer(Container): logging.info('Creating and running zookeeper docker container...') self.client.containers.run( - image="zookeeper:3.8.1", + image="zookeeper:3.9.2", detach=True, name=self.name, network=self.network.name,