[incubator-seatunnel] branch dev updated: [Improve][Zeta] Improve stability of zeta local mode (#4183)

[wanghailin]

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

wanghailin pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-seatunnel.git


The following commit(s) were added to refs/heads/dev by this push:
     new 7a0a3da25 [Improve][Zeta] Improve stability of zeta local mode (#4183)
7a0a3da25 is described below

commit 7a0a3da25538f32931bffc711997430fc5b9c43e
Author: Tyrantlucifer <tyrantluci...@gmail.com>
AuthorDate: Thu Feb 23 13:16:50 2023 +0800

    [Improve][Zeta] Improve stability of zeta local mode (#4183)
---
 .../seatunnel-starter/src/main/bin/seatunnel.sh       |  2 +-
 .../starter/seatunnel/args/ClientCommandArgs.java     | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/seatunnel-core/seatunnel-starter/src/main/bin/seatunnel.sh 
b/seatunnel-core/seatunnel-starter/src/main/bin/seatunnel.sh
index d5b50250c..e96a40e1b 100755
--- a/seatunnel-core/seatunnel-starter/src/main/bin/seatunnel.sh
+++ b/seatunnel-core/seatunnel-starter/src/main/bin/seatunnel.sh
@@ -85,7 +85,7 @@ JAVA_OPTS="${JAVA_OPTS} 
-Dhazelcast.config=${HAZELCAST_CONFIG}"
 if [ -e "${CONF_DIR}/log4j2_client.properties" ]; then
   JAVA_OPTS="${JAVA_OPTS} 
-Dlog4j2.configurationFile=${CONF_DIR}/log4j2_client.properties"
   JAVA_OPTS="${JAVA_OPTS} -Dseatunnel.logs.path=${APP_DIR}/logs"
-  if [[ $args == *" -m local"* || $args == *" --master local"* ]]; then
+  if [[ $args == *" -m local"* || $args == *" --master local"* || $args == *" 
-e local"* || $args == *" --deploy-mode local"* ]]; then
     JAVA_OPTS="${JAVA_OPTS} 
-Dseatunnel.logs.file_name=seatunnel-starter-client-$((`date '+%s'`*1000+`date 
'+%N'`/1000000))"
   else
       JAVA_OPTS="${JAVA_OPTS} 
-Dseatunnel.logs.file_name=seatunnel-starter-client"
diff --git 
a/seatunnel-core/seatunnel-starter/src/main/java/org/apache/seatunnel/core/starter/seatunnel/args/ClientCommandArgs.java
 
b/seatunnel-core/seatunnel-starter/src/main/java/org/apache/seatunnel/core/starter/seatunnel/args/ClientCommandArgs.java
index 905c7a29c..b0022c6c1 100644
--- 
a/seatunnel-core/seatunnel-starter/src/main/java/org/apache/seatunnel/core/starter/seatunnel/args/ClientCommandArgs.java
+++ 
b/seatunnel-core/seatunnel-starter/src/main/java/org/apache/seatunnel/core/starter/seatunnel/args/ClientCommandArgs.java
@@ -25,10 +25,13 @@ import org.apache.seatunnel.core.starter.enums.MasterType;
 import 
org.apache.seatunnel.core.starter.seatunnel.command.ClientExecuteCommand;
 import 
org.apache.seatunnel.core.starter.seatunnel.command.SeaTunnelConfValidateCommand;
 
+import com.beust.jcommander.IParameterValidator;
 import com.beust.jcommander.IStringConverter;
 import com.beust.jcommander.Parameter;
+import com.beust.jcommander.ParameterException;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.extern.slf4j.Slf4j;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -37,8 +40,9 @@ import java.util.List;
 @Data
 public class ClientCommandArgs extends AbstractCommandArgs {
     @Parameter(
-            names = {"-m", "--master"},
+            names = {"-m", "--master", "-e", "--deploy-mode"},
             description = "SeaTunnel job submit master, support [local, 
cluster]",
+            validateWith = MasterTypeValidator.class,
             converter = SeaTunnelMasterTargetConverter.class)
     private MasterType masterType = MasterType.CLUSTER;
 
@@ -116,4 +120,17 @@ public class ClientCommandArgs extends AbstractCommandArgs 
{
             }
         }
     }
+
+    @Slf4j
+    public static class MasterTypeValidator implements IParameterValidator {
+        @Override
+        public void validate(String name, String value) throws 
ParameterException {
+            if (name.equals("-e") || name.equals("--deploy-mode")) {
+                log.warn(
+                        
"\n******************************************************************************************"
+                                + "\n-e and --deploy-mode will be deprecated 
in 2.3.1, please use -m and --master instead of it"
+                                + 
"\n******************************************************************************************");
+            }
+        }
+    }
 }