You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ke...@apache.org on 2022/08/10 04:54:20 UTC

[dolphinscheduler] branch dev updated: [Fix-11376][task plugin]Seatunnel Task cannot save successfully when … (#11377)

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

kerwin pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new 03582f2e70 [Fix-11376][task plugin]Seatunnel Task cannot save successfully when … (#11377)
03582f2e70 is described below

commit 03582f2e7039498d5563626b88dd8616d163c3f3
Author: Assert <42...@users.noreply.github.com>
AuthorDate: Wed Aug 10 12:54:09 2022 +0800

    [Fix-11376][task plugin]Seatunnel Task cannot save successfully when … (#11377)
---
 .../task/seatunnel/spark/SeatunnelSparkParameters.java       | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-seatunnel/src/main/java/org/apache/dolphinscheduler/plugin/task/seatunnel/spark/SeatunnelSparkParameters.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-seatunnel/src/main/java/org/apache/dolphinscheduler/plugin/task/seatunnel/spark/SeatunnelSparkParameters.java
index 1cc5285f39..a21538e9b5 100644
--- a/dolphinscheduler-task-plugin/dolphinscheduler-task-seatunnel/src/main/java/org/apache/dolphinscheduler/plugin/task/seatunnel/spark/SeatunnelSparkParameters.java
+++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-seatunnel/src/main/java/org/apache/dolphinscheduler/plugin/task/seatunnel/spark/SeatunnelSparkParameters.java
@@ -33,10 +33,14 @@ public class SeatunnelSparkParameters extends SeatunnelParameters {
 
     @Override
     public boolean checkParameters() {
-        return super.checkParameters()
-                && Objects.nonNull(deployMode)
-                && (DeployModeEnum.local != deployMode && Objects.nonNull(master))
-                && (DeployModeEnum.local != deployMode && (MasterTypeEnum.SPARK == master || MasterTypeEnum.MESOS == master) && StringUtils.isNotBlank(masterUrl));
+        boolean result = super.checkParameters() && Objects.nonNull(deployMode);
+        if (result && DeployModeEnum.local != deployMode) {
+            result = Objects.nonNull(master);
+            if (result && (MasterTypeEnum.SPARK == master || MasterTypeEnum.MESOS == master)) {
+                result = StringUtils.isNotBlank(masterUrl);
+            }
+        }
+        return result;
     }
 
     public static enum MasterTypeEnum {