diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-seatunnel/src/main/java/org/apache/dolphinscheduler/plugin/task/seatunnel/flink/SeatunnelFlinkParameters.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-seatunnel/src/main/java/org/apache/dolphinscheduler/plugin/task/seatunnel/flink/SeatunnelFlinkParameters.java index 51a01b335e31..8bbe661ef5bf 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-seatunnel/src/main/java/org/apache/dolphinscheduler/plugin/task/seatunnel/flink/SeatunnelFlinkParameters.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-seatunnel/src/main/java/org/apache/dolphinscheduler/plugin/task/seatunnel/flink/SeatunnelFlinkParameters.java @@ -35,8 +35,8 @@ public class SeatunnelFlinkParameters extends SeatunnelParameters { public enum RunModeEnum { NONE("none"), - RUN("--deploy-mode run"), - RUN_APPLICATION("--deploy-mode run-application"); + RUN("--master run"), + RUN_APPLICATION("--master run-application"); private final String command; @@ -44,4 +44,4 @@ public enum RunModeEnum { this.command = command; } } -} +} \ No newline at end of file diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-seatunnel/src/main/java/org/apache/dolphinscheduler/plugin/task/seatunnel/spark/SeatunnelSparkTask.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-seatunnel/src/main/java/org/apache/dolphinscheduler/plugin/task/seatunnel/spark/SeatunnelSparkTask.java index cb1e6aeb3e75..fae2de59a8bc 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-seatunnel/src/main/java/org/apache/dolphinscheduler/plugin/task/seatunnel/spark/SeatunnelSparkTask.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-seatunnel/src/main/java/org/apache/dolphinscheduler/plugin/task/seatunnel/spark/SeatunnelSparkTask.java @@ -17,7 +17,6 @@ package org.apache.dolphinscheduler.plugin.task.seatunnel.spark; -import static org.apache.dolphinscheduler.plugin.task.seatunnel.Constants.DEPLOY_MODE_OPTIONS; import static org.apache.dolphinscheduler.plugin.task.seatunnel.Constants.MASTER_OPTIONS; import org.apache.dolphinscheduler.common.utils.JSONUtils; @@ -51,19 +50,18 @@ public void init() { @Override public List buildOptions() throws Exception { List args = super.buildOptions(); - args.add(DEPLOY_MODE_OPTIONS); - args.add(seatunnelParameters.getDeployMode().getCommand()); - - MasterTypeEnum master = DeployModeEnum.local == seatunnelParameters.getDeployMode() ? MasterTypeEnum.LOCAL - : seatunnelParameters.getMaster(); - - args.add(MASTER_OPTIONS); - if (MasterTypeEnum.SPARK.equals(master) || MasterTypeEnum.MESOS.equals(master)) { - args.add(master.getCommand() + seatunnelParameters.getMasterUrl()); + if (DeployModeEnum.local == seatunnelParameters.getDeployMode()) { + args.add(MASTER_OPTIONS); + args.add(MasterTypeEnum.LOCAL.getCommand()); } else { - args.add(master.getCommand()); + MasterTypeEnum master = seatunnelParameters.getMaster(); + args.add(MASTER_OPTIONS); + if (MasterTypeEnum.SPARK.equals(master) || MasterTypeEnum.MESOS.equals(master)) { + args.add(master.getCommand() + seatunnelParameters.getMasterUrl()); + } else { + args.add(master.getCommand()); + } } - return args; } -} +} \ No newline at end of file