[flink-table-store] branch master updated: [FLINK-27542] E2e docker image should not occupy host machine ports as tests may run in parallel

[lzljs3620320]

This is an automated email from the ASF dual-hosted git repository.

lzljs3620320 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-table-store.git


The following commit(s) were added to refs/heads/master by this push:
     new 2bce9d6  [FLINK-27542] E2e docker image should not occupy host machine 
ports as tests may run in parallel
2bce9d6 is described below

commit 2bce9d695f06c2775902532b0ccda5b0f0a6a514
Author: tsreaper <tsreape...@gmail.com>
AuthorDate: Wed May 11 11:22:47 2022 +0800

    [FLINK-27542] E2e docker image should not occupy host machine ports as 
tests may run in parallel
    
    This closes #118
---
 .../java/org/apache/flink/table/store/tests/E2eTestBase.java |  6 +-----
 .../src/test/resources-filtered/docker-compose.yaml          | 12 ++++++------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git 
a/flink-table-store-e2e-tests/src/test/java/org/apache/flink/table/store/tests/E2eTestBase.java
 
b/flink-table-store-e2e-tests/src/test/java/org/apache/flink/table/store/tests/E2eTestBase.java
index ece6ee6..f79a425 100644
--- 
a/flink-table-store-e2e-tests/src/test/java/org/apache/flink/table/store/tests/E2eTestBase.java
+++ 
b/flink-table-store-e2e-tests/src/test/java/org/apache/flink/table/store/tests/E2eTestBase.java
@@ -96,11 +96,7 @@ public abstract class E2eTestBase {
         }
         environment.withServices(services.toArray(new String[0]));
 
-        synchronized (E2eTestBase.class) {
-            // there are some steps which cannot be executed in parallel when 
starting the same
-            // docker image, so we should lock here
-            environment.start();
-        }
+        environment.start();
         jobManager = 
environment.getContainerByServiceName("jobmanager_1").get();
         jobManager.execInContainer("chown", "-R", "flink:flink", 
TEST_DATA_DIR);
 
diff --git 
a/flink-table-store-e2e-tests/src/test/resources-filtered/docker-compose.yaml 
b/flink-table-store-e2e-tests/src/test/resources-filtered/docker-compose.yaml
index 7918c70..cfe4ccc 100644
--- 
a/flink-table-store-e2e-tests/src/test/resources-filtered/docker-compose.yaml
+++ 
b/flink-table-store-e2e-tests/src/test/resources-filtered/docker-compose.yaml
@@ -35,8 +35,8 @@ services:
       testnetwork:
         aliases:
           - jobmanager
-    ports:
-      - "8081:8081"
+    expose:
+      - "8081"
 
   taskmanager:
     image: apache/flink:${flink.version}
@@ -65,8 +65,8 @@ services:
     environment:
       ZOOKEEPER_CLIENT_PORT: 2181
       ZOOKEEPER_TICK_TIME: 2000
-    ports:
-      - "2181:2181"
+    expose:
+      - "2181"
 
   kafka:
     image: confluentinc/cp-kafka:7.0.1
@@ -85,8 +85,8 @@ services:
       KAFKA_TRANSACTION_MAX_TIMEOUT_MS: 7200000
       # Disable log deletion to prevent records from being deleted during test 
run
       KAFKA_LOG_RETENTION_MS: -1
-    ports:
-      - "9092:9092"
+    expose:
+      - "9092"
     depends_on:
       - zookeeper