You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ki...@apache.org on 2021/07/07 09:34:47 UTC
[dolphinscheduler] branch dev updated: [FIX-#5721][master-server]
Global params parameter missing (#5757)
This is an automated email from the ASF dual-hosted git repository.
kirs 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 7a18ada [FIX-#5721][master-server] Global params parameter missing (#5757)
7a18ada is described below
commit 7a18adae5261e37def2ca1ede0320043d18abfab
Author: wangxj3 <85...@qq.com>
AuthorDate: Wed Jul 7 17:34:38 2021 +0800
[FIX-#5721][master-server] Global params parameter missing (#5757)
Co-authored-by: wangxj <wangxj31>
---
.../org/apache/dolphinscheduler/dao/entity/TaskInstance.java | 4 ++++
.../dolphinscheduler/server/master/runner/MasterExecThread.java | 9 ++++++---
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java
index 3733c6d..aa87272 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java
@@ -627,4 +627,8 @@ public class TaskInstance implements Serializable {
public void setTaskParams(String taskParams) {
this.taskParams = taskParams;
}
+
+ public boolean isFirstRun() {
+ return endTime == null;
+ }
}
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
index c18ed78..1863087 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
@@ -520,9 +520,6 @@ public class MasterExecThread implements Runnable {
taskInstance.setDelayTime(taskNode.getDelayTime());
}
- //get pre task ,get all the task varPool to this task
- Set<String> preTask = dag.getPreviousNodes(taskInstance.getName());
- getPreVarPool(taskInstance, preTask);
return taskInstance;
}
@@ -1154,6 +1151,12 @@ public class MasterExecThread implements Runnable {
continue;
}
}
+ //init varPool only this task is the first time running
+ if (task.isFirstRun()) {
+ //get pre task ,get all the task varPool to this task
+ Set<String> preTask = dag.getPreviousNodes(task.getName());
+ getPreVarPool(task, preTask);
+ }
DependResult dependResult = getDependResultForTask(task);
if (DependResult.SUCCESS == dependResult) {
if (retryTaskIntervalOverTime(task)) {