From 29242eb426062e7a28e97422cdb80d53531f1157 Mon Sep 17 00:00:00 2001 From: see-quick Date: Mon, 2 Dec 2024 13:39:25 +0100 Subject: [PATCH 1/3] Fix race condition for KRaft during multi-node setup Signed-off-by: see-quick --- .../java/io/strimzi/test/container/StrimziKafkaContainer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/io/strimzi/test/container/StrimziKafkaContainer.java b/src/main/java/io/strimzi/test/container/StrimziKafkaContainer.java index c934f0f..60bbd01 100644 --- a/src/main/java/io/strimzi/test/container/StrimziKafkaContainer.java +++ b/src/main/java/io/strimzi/test/container/StrimziKafkaContainer.java @@ -274,6 +274,7 @@ protected void containerIsStarting(final InspectContainerResponse containerInfo, LOGGER.info("New `cluster.id` has been generated: {}", this.clusterId); } + command += "cat /opt/kafka/config/kraft/server.properties\n"; command += "bin/kafka-storage.sh format -t=\"" + this.clusterId + "\" -c /opt/kafka/config/kraft/server.properties \n"; command += "bin/kafka-server-start.sh /opt/kafka/config/kraft/server.properties \n"; } @@ -374,7 +375,7 @@ protected String[] buildListenersConfig(final InspectContainerResponse container advertisedListeners.append(",") .append(controllerListenerName) .append("://") - .append(getHost()) + .append(NETWORK_ALIAS_PREFIX + this.brokerId) .append(":") .append(controllerPort); } From 4b942a7eb04928d8b4325f73ae9d1ccd37d28b81 Mon Sep 17 00:00:00 2001 From: see-quick Date: Mon, 2 Dec 2024 13:42:51 +0100 Subject: [PATCH 2/3] remove cat Signed-off-by: see-quick --- .../java/io/strimzi/test/container/StrimziKafkaContainer.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/io/strimzi/test/container/StrimziKafkaContainer.java b/src/main/java/io/strimzi/test/container/StrimziKafkaContainer.java index 60bbd01..165aca1 100644 --- a/src/main/java/io/strimzi/test/container/StrimziKafkaContainer.java +++ b/src/main/java/io/strimzi/test/container/StrimziKafkaContainer.java @@ -274,7 +274,6 @@ protected void containerIsStarting(final InspectContainerResponse containerInfo, LOGGER.info("New `cluster.id` has been generated: {}", this.clusterId); } - command += "cat /opt/kafka/config/kraft/server.properties\n"; command += "bin/kafka-storage.sh format -t=\"" + this.clusterId + "\" -c /opt/kafka/config/kraft/server.properties \n"; command += "bin/kafka-server-start.sh /opt/kafka/config/kraft/server.properties \n"; } From e6d1dd05dd42c5fb5d5c5d8067e716c991f5cbdd Mon Sep 17 00:00:00 2001 From: see-quick Date: Mon, 2 Dec 2024 13:46:20 +0100 Subject: [PATCH 3/3] update test Signed-off-by: see-quick --- .../strimzi/test/container/StrimziKafkaContainerMockTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/io/strimzi/test/container/StrimziKafkaContainerMockTest.java b/src/test/java/io/strimzi/test/container/StrimziKafkaContainerMockTest.java index 7ca2199..0903c69 100644 --- a/src/test/java/io/strimzi/test/container/StrimziKafkaContainerMockTest.java +++ b/src/test/java/io/strimzi/test/container/StrimziKafkaContainerMockTest.java @@ -55,7 +55,7 @@ public String getBootstrapServers() { .buildListenersConfig(containerInfo); String expectedListeners = "PLAINTEXT://0.0.0.0:9092,BROKER1://0.0.0.0:9091,CONTROLLER://0.0.0.0:9094"; - String expectedAdvertisedListeners = "PLAINTEXT://localhost:9092,BROKER1://172.17.0.2:9091,CONTROLLER://localhost:9094"; + String expectedAdvertisedListeners = "PLAINTEXT://localhost:9092,BROKER1://172.17.0.2:9091,CONTROLLER://broker-0:9094"; assertThat(listenersConfig[0], is(expectedListeners)); assertThat(listenersConfig[1], is(expectedAdvertisedListeners)); @@ -152,7 +152,7 @@ public String getBootstrapServers() { String[] listenersConfig = kafkaContainer.buildListenersConfig(containerInfo); String expectedListeners = "PLAINTEXT://0.0.0.0:9092,BROKER1://0.0.0.0:9091,CONTROLLER://0.0.0.0:9094"; - String expectedAdvertisedListeners = "PLAINTEXT://localhost:9092,BROKER1://172.17.0.2:9091,CONTROLLER://localhost:9094"; + String expectedAdvertisedListeners = "PLAINTEXT://localhost:9092,BROKER1://172.17.0.2:9091,CONTROLLER://broker-0:9094"; assertThat(listenersConfig[0], is(expectedListeners)); assertThat(listenersConfig[1], is(expectedAdvertisedListeners));