This is an automated email from the ASF dual-hosted git repository. manikumar pushed a commit to branch 3.7 in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/3.7 by this push: new d73560155ec MINOR: Rename and update test files for docker image (#14991) d73560155ec is described below commit d73560155ec4876c51343176bd9c2be17acd345c Author: Vedarth Sharma <142404391+vedarthconflu...@users.noreply.github.com> AuthorDate: Wed Dec 13 11:59:48 2023 +0530 MINOR: Rename and update test files for docker image (#14991) Update the port mapping in test compose files to align with the recommendations in example files Reviewers: Manikumar Reddy <manikumar.re...@gmail.com> --- docker/test/constants.py | 4 +-- docker/test/docker_sanity_test.py | 8 ++--- docker/test/fixtures/file-input/server.properties | 4 +-- .../{jvm => mode}/combined/docker-compose.yml | 28 +++++++-------- .../{jvm => mode}/isolated/docker-compose.yml | 40 +++++++++++----------- 5 files changed, 42 insertions(+), 42 deletions(-) diff --git a/docker/test/constants.py b/docker/test/constants.py index cc8e8249066..710e29b6961 100644 --- a/docker/test/constants.py +++ b/docker/test/constants.py @@ -18,8 +18,8 @@ KAFKA_CONSOLE_PRODUCER="fixtures/kafka/bin/kafka-console-producer.sh" KAFKA_CONSOLE_CONSUMER="fixtures/kafka/bin/kafka-console-consumer.sh" KAFKA_RUN_CLASS="fixtures/kafka/bin/kafka-run-class.sh" -JVM_COMBINED_MODE_COMPOSE="fixtures/jvm/combined/docker-compose.yml" -JVM_ISOLATED_COMPOSE="fixtures/jvm/isolated/docker-compose.yml" +COMBINED_MODE_COMPOSE="fixtures/mode/combined/docker-compose.yml" +ISOLATED_MODE_COMPOSE="fixtures/mode/isolated/docker-compose.yml" CLIENT_TIMEOUT=40000 diff --git a/docker/test/docker_sanity_test.py b/docker/test/docker_sanity_test.py index 3bebaefbfd4..60007b5ded4 100644 --- a/docker/test/docker_sanity_test.py +++ b/docker/test/docker_sanity_test.py @@ -199,17 +199,17 @@ class DockerSanityTest(unittest.TestCase): class DockerSanityTestJVMCombinedMode(DockerSanityTest): def setUp(self) -> None: - self.start_compose(f"{self.FIXTURES_DIR}/{constants.JVM_COMBINED_MODE_COMPOSE}") + self.start_compose(f"{self.FIXTURES_DIR}/{constants.COMBINED_MODE_COMPOSE}") def tearDown(self) -> None: - self.destroy_compose(f"{self.FIXTURES_DIR}/{constants.JVM_COMBINED_MODE_COMPOSE}") + self.destroy_compose(f"{self.FIXTURES_DIR}/{constants.COMBINED_MODE_COMPOSE}") def test_bed(self): self.execute() class DockerSanityTestJVMIsolatedMode(DockerSanityTest): def setUp(self) -> None: - self.start_compose(f"{self.FIXTURES_DIR}/{constants.JVM_ISOLATED_COMPOSE}") + self.start_compose(f"{self.FIXTURES_DIR}/{constants.ISOLATED_MODE_COMPOSE}") def tearDown(self) -> None: - self.destroy_compose(f"{self.FIXTURES_DIR}/{constants.JVM_ISOLATED_COMPOSE}") + self.destroy_compose(f"{self.FIXTURES_DIR}/{constants.ISOLATED_MODE_COMPOSE}") def test_bed(self): self.execute() diff --git a/docker/test/fixtures/file-input/server.properties b/docker/test/fixtures/file-input/server.properties index 781f058650e..3beea517112 100644 --- a/docker/test/fixtures/file-input/server.properties +++ b/docker/test/fixtures/file-input/server.properties @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -advertised.listeners=PLAINTEXT://localhost:19093,SSL://localhost:9094 +advertised.listeners=PLAINTEXT_HOST://localhost:39092,SSL://localhost:9094,PLAINTEXT://broker3:29092 controller.listener.names=CONTROLLER group.initial.rebalance.delay.ms=0 inter.broker.listener.name=PLAINTEXT -listener.security.protocol.map=PLAINTEXT:PLAINTEXT,SSL:SSL,CONTROLLER:PLAINTEXT +listener.security.protocol.map=PLAINTEXT:PLAINTEXT,SSL:SSL,CONTROLLER:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT log.dirs=/tmp/kraft-combined-logs offsets.topic.replication.factor=1 process.roles=to be overridden diff --git a/docker/test/fixtures/jvm/combined/docker-compose.yml b/docker/test/fixtures/mode/combined/docker-compose.yml similarity index 77% rename from docker/test/fixtures/jvm/combined/docker-compose.yml rename to docker/test/fixtures/mode/combined/docker-compose.yml index b62f7a84529..da199ea93a8 100644 --- a/docker/test/fixtures/jvm/combined/docker-compose.yml +++ b/docker/test/fixtures/mode/combined/docker-compose.yml @@ -23,20 +23,20 @@ services: ports: - "9092:9092" - "9101:9101" - - "19091:19091" + - "19093:9093" volumes: - ../../secrets:/etc/kafka/secrets environment: KAFKA_NODE_ID: 1 - KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: 'CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,SSL:SSL' - KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://localhost:9092,SSL://localhost:19091' + KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: 'CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,SSL:SSL,PLAINTEXT_HOST:PLAINTEXT' + KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT_HOST://localhost:9092,SSL://localhost:19093,PLAINTEXT://broker1:29092' KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1 KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0 KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1 KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1 KAFKA_PROCESS_ROLES: 'broker,controller' - KAFKA_CONTROLLER_QUORUM_VOTERS: '1@broker1:29093' - KAFKA_LISTENERS: 'CONTROLLER://broker1:29093,PLAINTEXT://0.0.0.0:9092,SSL://0.0.0.0:19091' + KAFKA_CONTROLLER_QUORUM_VOTERS: '1@broker1:19092,2@broker2:19092,3@broker3:19092' + KAFKA_LISTENERS: 'CONTROLLER://:19092,PLAINTEXT_HOST://:9092,SSL://:9093,PLAINTEXT://:29092' KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT' KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER' KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs' @@ -56,20 +56,20 @@ services: container_name: broker2 ports: - "9093:9093" - - "19092:19092" + - "19092:9092" volumes: - ../../secrets:/etc/kafka/secrets environment: KAFKA_NODE_ID: 2 - KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "PLAINTEXT:PLAINTEXT,SSL:SSL,CONTROLLER:PLAINTEXT" - KAFKA_ADVERTISED_LISTENERS: "PLAINTEXT://localhost:19092,SSL://localhost:9093" + KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "PLAINTEXT:PLAINTEXT,SSL:SSL,CONTROLLER:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT" + KAFKA_ADVERTISED_LISTENERS: "PLAINTEXT_HOST://localhost:19092,SSL://localhost:9093,PLAINTEXT://broker2:29092" KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1 KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0 KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1 KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1 KAFKA_PROCESS_ROLES: 'broker,controller' - KAFKA_CONTROLLER_QUORUM_VOTERS: '2@broker2:29093' - KAFKA_LISTENERS: "PLAINTEXT://0.0.0.0:19092,SSL://0.0.0.0:9093,CONTROLLER://broker2:29093" + KAFKA_CONTROLLER_QUORUM_VOTERS: '1@broker1:19092,2@broker2:19092,3@broker3:19092' + KAFKA_LISTENERS: 'CONTROLLER://:19092,PLAINTEXT_HOST://:9092,SSL://:9093,PLAINTEXT://:29092' KAFKA_INTER_BROKER_LISTENER_NAME: "PLAINTEXT" KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER' KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs' @@ -86,8 +86,8 @@ services: hostname: broker3 container_name: broker3 ports: - - "19093:19093" - - "9094:9094" + - "39092:9092" + - "9094:9093" volumes: - ../../secrets:/etc/kafka/secrets - ../../file-input:/mnt/shared/config @@ -95,7 +95,7 @@ services: CLUSTER_ID: '4L6g3nShT-eMCtK--X86sw' # Set properties absent from the file KAFKA_NODE_ID: 3 - KAFKA_CONTROLLER_QUORUM_VOTERS: '3@broker3:29093' - KAFKA_LISTENERS: 'PLAINTEXT://0.0.0.0:19093,SSL://0.0.0.0:9094,CONTROLLER://broker3:29093' + KAFKA_CONTROLLER_QUORUM_VOTERS: '1@broker1:19092,2@broker2:19092,3@broker3:19092' + KAFKA_LISTENERS: 'CONTROLLER://:19092,PLAINTEXT_HOST://:9092,SSL://:9093,PLAINTEXT://:29092' # Override an existing property KAFKA_PROCESS_ROLES: 'broker,controller' diff --git a/docker/test/fixtures/jvm/isolated/docker-compose.yml b/docker/test/fixtures/mode/isolated/docker-compose.yml similarity index 78% rename from docker/test/fixtures/jvm/isolated/docker-compose.yml rename to docker/test/fixtures/mode/isolated/docker-compose.yml index a3bf6de1057..5e27cbe5607 100644 --- a/docker/test/fixtures/jvm/isolated/docker-compose.yml +++ b/docker/test/fixtures/mode/isolated/docker-compose.yml @@ -28,8 +28,8 @@ services: KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1 KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1 KAFKA_PROCESS_ROLES: 'controller' - KAFKA_CONTROLLER_QUORUM_VOTERS: '1@controller1:29093,2@controller2:39093,3@controller3:49093' - KAFKA_LISTENERS: 'CONTROLLER://controller1:29093' + KAFKA_CONTROLLER_QUORUM_VOTERS: '1@controller1:19092,2@controller2:19092,3@controller3:19092' + KAFKA_LISTENERS: 'CONTROLLER://:19092' KAFKA_INTER_BROKER_LISTENER_NAME: 'CONTROLLER' KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER' KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs' @@ -47,8 +47,8 @@ services: KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1 KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1 KAFKA_PROCESS_ROLES: 'controller' - KAFKA_CONTROLLER_QUORUM_VOTERS: '1@controller1:29093,2@controller2:39093,3@controller3:49093' - KAFKA_LISTENERS: 'CONTROLLER://controller2:39093' + KAFKA_CONTROLLER_QUORUM_VOTERS: '1@controller1:19092,2@controller2:19092,3@controller3:19092' + KAFKA_LISTENERS: 'CONTROLLER://:19092' KAFKA_INTER_BROKER_LISTENER_NAME: 'CONTROLLER' KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER' KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs' @@ -66,8 +66,8 @@ services: KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1 KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1 KAFKA_PROCESS_ROLES: 'controller' - KAFKA_CONTROLLER_QUORUM_VOTERS: '1@controller1:29093,2@controller2:39093,3@controller3:49093' - KAFKA_LISTENERS: 'CONTROLLER://controller3:49093' + KAFKA_CONTROLLER_QUORUM_VOTERS: '1@controller1:19092,2@controller2:19092,3@controller3:19092' + KAFKA_LISTENERS: 'CONTROLLER://:19092' KAFKA_INTER_BROKER_LISTENER_NAME: 'CONTROLLER' KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER' KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs' @@ -79,21 +79,21 @@ services: container_name: broker1 ports: - "9092:9092" - - "19091:19091" + - "19093:9093" - "9101:9101" volumes: - ../../secrets:/etc/kafka/secrets environment: KAFKA_NODE_ID: 4 - KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: 'CONTROLLER:PLAINTEXT,SSL:SSL,PLAINTEXT:PLAINTEXT' - KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://localhost:9092,SSL://localhost:19091' + KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: 'CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,SSL:SSL,PLAINTEXT_HOST:PLAINTEXT' + KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT_HOST://localhost:9092,SSL://localhost:19093,PLAINTEXT://broker1:29092' KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1 KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0 KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1 KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1 KAFKA_PROCESS_ROLES: 'broker' - KAFKA_CONTROLLER_QUORUM_VOTERS: '1@controller1:29093,2@controller2:39093,3@controller3:49093' - KAFKA_LISTENERS: 'PLAINTEXT://0.0.0.0:9092,SSL://0.0.0.0:19091' + KAFKA_CONTROLLER_QUORUM_VOTERS: '1@controller1:19092,2@controller2:19092,3@controller3:19092' + KAFKA_LISTENERS: 'PLAINTEXT_HOST://:9092,SSL://:9093,PLAINTEXT://:29092' KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT' KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER' KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs' @@ -117,20 +117,20 @@ services: container_name: broker2 ports: - "9093:9093" - - "19092:19092" + - "19092:9092" volumes: - ../../secrets:/etc/kafka/secrets environment: KAFKA_NODE_ID: 5 - KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "PLAINTEXT:PLAINTEXT,SSL:SSL,CONTROLLER:PLAINTEXT" - KAFKA_ADVERTISED_LISTENERS: "PLAINTEXT://localhost:19092,SSL://localhost:9093" + KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: 'CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,SSL:SSL,PLAINTEXT_HOST:PLAINTEXT' + KAFKA_ADVERTISED_LISTENERS: "PLAINTEXT_HOST://localhost:19092,SSL://localhost:9093,PLAINTEXT://broker2:29092" KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1 KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0 KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1 KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1 KAFKA_PROCESS_ROLES: 'broker' - KAFKA_CONTROLLER_QUORUM_VOTERS: '1@controller1:29093,2@controller2:39093,3@controller3:49093' - KAFKA_LISTENERS: "PLAINTEXT://0.0.0.0:19092,SSL://0.0.0.0:9093" + KAFKA_CONTROLLER_QUORUM_VOTERS: '1@controller1:19092,2@controller2:19092,3@controller3:19092' + KAFKA_LISTENERS: 'PLAINTEXT_HOST://:9092,SSL://:9093,PLAINTEXT://:29092' KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT' KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER' KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs' @@ -151,8 +151,8 @@ services: hostname: broker3 container_name: broker3 ports: - - "19093:19093" - - "9094:9094" + - "39092:9092" + - "9094:9093" volumes: - ../../secrets:/etc/kafka/secrets - ../../file-input:/mnt/shared/config @@ -162,8 +162,8 @@ services: KAFKA_NODE_ID: 6 # Override existing properties KAFKA_PROCESS_ROLES: 'broker' - KAFKA_LISTENERS: "PLAINTEXT://0.0.0.0:19093,SSL://0.0.0.0:9094" - KAFKA_CONTROLLER_QUORUM_VOTERS: '1@controller1:29093,2@controller2:39093,3@controller3:49093' + KAFKA_LISTENERS: 'PLAINTEXT_HOST://:9092,SSL://:9093,PLAINTEXT://:29092' + KAFKA_CONTROLLER_QUORUM_VOTERS: '1@controller1:19092,2@controller2:19092,3@controller3:19092' depends_on: - controller1 - controller2