Revert "Revert "[Improve][Zeta][Config] change Zeta config (apache#4043…

…)" (apache#4152)" This reverts commit 9433fa2.
liugddx · Mar 19, 2023 · da36ac7 · da36ac7
1 parent 56fbc8e
commit da36ac7
Show file tree

Hide file tree

Showing 10 changed files with 154 additions and 47 deletions.
diff --git a/config/hazelcast-client.yaml b/config/hazelcast-client.yaml
@@ -21,4 +21,4 @@ hazelcast-client:
     hazelcast.logging.type: log4j2
   network:
     cluster-members:
-      - localhost:5801
+      - localhost:5801
diff --git a/config/hazelcast.yaml b/config/hazelcast.yaml
@@ -17,11 +17,29 @@
 
 hazelcast:
   cluster-name: seatunnel
-  network:
-    rest-api:
-      enabled: true
+  advanced-network:
+    enabled: true
+    member-server-socket-endpoint-config:
+      port:
+        auto-increment: true
+        port-count: 100
+        port: 9000
+    client-server-socket-endpoint-config:
+      port:
+        auto-increment: true
+        port-count: 100
+        port: 5801
+    rest-server-socket-endpoint-config:
+      port:
+        auto-increment: true
+        port-count: 100
+        port: 8080
       endpoint-groups:
-        CLUSTER_WRITE:
+        WAN:
+          enabled: true
+        CLUSTER_READ:
+          enabled: true
+        HEALTH_CHECK:
           enabled: true
         DATA:
           enabled: true
@@ -30,9 +48,6 @@ hazelcast:
         enabled: true
         member-list:
           - localhost
-    port:
-      auto-increment: false
-      port: 5801
   properties:
     hazelcast.invocation.max.retry.count: 20
     hazelcast.tcp.join.port.try.count: 30

diff --git a/docs/en/seatunnel-engine/deployment.md b/docs/en/seatunnel-engine/deployment.md
@@ -121,7 +121,7 @@ SeaTunnel Engine uses the following discovery mechanisms.
 
 #### TCP
 
-You can configure SeaTunnel Engine to be a full TCP/IP cluster. See the [Discovering Members by TCP section](tcp.md) for configuration details.
+You can configure SeaTunnel Engine to be a full TCP/IP cluster. See the [Discovering Members by TCP section](network.md) for configuration details.
 
 An example is like this `hazelcast.yaml`
 

diff --git a/docs/en/seatunnel-engine/tcp.md → docs/en/seatunnel-engine/network.md b/docs/en/seatunnel-engine/tcp.md → docs/en/seatunnel-engine/network.md
@@ -3,7 +3,7 @@
 sidebar_position: 6
 -------------------
 
-# TCP NetWork
+## TCP NetWork
 
 If multicast is not the preferred way of discovery for your environment, then you can configure SeaTunnel Engine to be a full TCP/IP cluster. When you configure SeaTunnel Engine to discover members by TCP/IP, you must list all or a subset of the members' host names and/or IP addresses as cluster members. You do not have to list all of these cluster members, but at least one of the listed members has to be active in the cluster when a new member joins.
 
@@ -16,7 +16,8 @@ The following is an example declarative configuration.
 
 ```yaml
 hazelcast:
-  network:
+  advanced-network:
+    enabled: true
     join:
       tcp-ip:
         enabled: true
@@ -35,3 +36,41 @@ Instead of providing members line-by-line as shown above, you also have the opti
 `<members>192.168.1.0-7,192.168.1.21</members>`
 
 If you do not provide ports for the members, Hazelcast automatically tries the ports `5701`, `5702` and so on.
+
+## Advanced Network Configuration
+
+Different kinds of network connections can be established with different socket options.
+
+When using the declarative configuration, specific element names introduce the server socket endpoint configuration for each protocol:
+
+- member-server-socket-endpoint-config for MEMBER protocol
+
+- client-server-socket-endpoint-config for CLIENT protocol
+
+- rest-server-socket-endpoint-config for REST endpoint
+
+```yaml
+member-server-socket-endpoint-config:
+      port:
+        auto-increment: true
+        port-count: 100
+        port: 9000
+    client-server-socket-endpoint-config:
+      port:
+        auto-increment: true
+        port-count: 100
+        port: 5801
+    rest-server-socket-endpoint-config:
+      port:
+        auto-increment: true
+        port-count: 100
+        port: 8080
+      endpoint-groups:
+        WAN:
+          enabled: true
+        CLUSTER_READ:
+          enabled: true
+        HEALTH_CHECK:
+          enabled: true
+```
+
diff --git a/docs/sidebars.js b/docs/sidebars.js
@@ -171,7 +171,7 @@ const sidebars = {
                 "seatunnel-engine/local-mode",
                 "seatunnel-engine/cluster-mode",
                 "seatunnel-engine/checkpoint-storage",
-                "seatunnel-engine/tcp"
+                "seatunnel-engine/network"
             ]
         },
         {

diff --git a/...eatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/resources/hazelcast-client.yaml b/...eatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/resources/hazelcast-client.yaml
@@ -33,4 +33,4 @@ hazelcast-client:
       - localhost:5812
       - localhost:5813
       - localhost:5814
-      - localhost:5815
+      - localhost:5815
diff --git a/...l-e2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/resources/hazelcast.yaml b/...l-e2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/resources/hazelcast.yaml
@@ -17,16 +17,35 @@
 
 hazelcast:
   cluster-name: seatunnel
-  network:
+  advanced-network:
+    enabled: true
+    member-server-socket-endpoint-config:
+      port:
+        auto-increment: true
+        port-count: 100
+        port: 9000
+    client-server-socket-endpoint-config:
+      port:
+        auto-increment: true
+        port-count: 100
+        port: 5801
+    rest-server-socket-endpoint-config:
+      port:
+        auto-increment: true
+        port-count: 100
+        port: 8080
+      endpoint-groups:
+        WAN:
+          enabled: true
+        CLUSTER_READ:
+          enabled: true
+        HEALTH_CHECK:
+          enabled: true
     join:
       tcp-ip:
         enabled: true
         member-list:
           - localhost
-    port:
-      auto-increment: true
-      port-count: 100
-      port: 5801
   properties:
     hazelcast.invocation.max.retry.count: 100
     hazelcast.invocation.retry.pause.millis: 1000

diff --git a/seatunnel-engine/seatunnel-engine-common/src/main/resources/hazelcast.yaml b/seatunnel-engine/seatunnel-engine-common/src/main/resources/hazelcast.yaml
@@ -17,11 +17,29 @@
 
 hazelcast:
   cluster-name: seatunnel
-  network:
-    rest-api:
-      enabled: true
+  advanced-network:
+    enabled: true
+    member-server-socket-endpoint-config:
+      port:
+        auto-increment: true
+        port-count: 100
+        port: 9000
+    client-server-socket-endpoint-config:
+      port:
+        auto-increment: true
+        port-count: 100
+        port: 5801
+    rest-server-socket-endpoint-config:
+      port:
+        auto-increment: true
+        port-count: 100
+        port: 8080
       endpoint-groups:
-        CLUSTER_WRITE:
+        WAN:
+          enabled: true
+        CLUSTER_READ:
+          enabled: true
+        HEALTH_CHECK:
           enabled: true
         DATA:
           enabled: true
@@ -30,10 +48,6 @@ hazelcast:
         enabled: true
         member-list:
           - localhost
-    port:
-      auto-increment: true
-      port-count: 100
-      port: 5801
   properties:
     hazelcast.invocation.max.retry.count: 20
     hazelcast.tcp.join.port.try.count: 30

diff --git a/seatunnel-engine/seatunnel-engine-common/src/test/resources/custmoize-client.yaml b/seatunnel-engine/seatunnel-engine-common/src/test/resources/custmoize-client.yaml
@@ -20,18 +20,19 @@ hazelcast-client:
 
   network:
     cluster-members:
-      - host:5801
-      - host:5802
-      - host:5803
-      - host:5804
-      - host:5805
-      - host:5806
-      - host:5807
-      - host:5808
-      - host:5809
-      - host:5810
-      - host:5811
-      - host:5812
-      - host:5813
-      - host:5814
-      - host:5815
+      - host:9000
+      - host:9001
+      - host:9002
+      - host:9003
+      - host:9004
+      - host:9005
+      - host:9006
+      - host:9007
+      - host:9008
+      - host:9009
+      - host:9010
+      - host:9011
+      - host:9012
+      - host:9013
+      - host:9014
+      - host:9015
diff --git a/seatunnel-engine/seatunnel-engine-common/src/test/resources/hazelcast.yaml b/seatunnel-engine/seatunnel-engine-common/src/test/resources/hazelcast.yaml
@@ -17,21 +17,40 @@
 
 hazelcast:
   cluster-name: seatunnel
-  network:
+  advanced-network:
+    enabled: true
+    member-server-socket-endpoint-config:
+      port:
+        auto-increment: true
+        port-count: 100
+        port: 9000
+    client-server-socket-endpoint-config:
+      port:
+        auto-increment: true
+        port-count: 100
+        port: 5801
+    rest-server-socket-endpoint-config:
+      port:
+        auto-increment: true
+        port-count: 100
+        port: 8080
+      endpoint-groups:
+        WAN:
+          enabled: true
+        CLUSTER_READ:
+          enabled: true
+        HEALTH_CHECK:
+          enabled: true
     join:
       tcp-ip:
         enabled: true
         member-list:
           - localhost
-    port:
-      auto-increment: true
-      port-count: 100
-      port: 5801
   map:
     map-name-template:
       map-store:
         enabled: true
         initial-mode: EAGER
         class-name: org.apache.seatunnel.engine.server.persistence.FileMapStore
         properties:
-          path: /tmp/file-store-map
+          path: /tmp/file-store-map