[dolphinscheduler] branch 2.0.6-prepare updated: to #9595: fix param lost when execute failed task (#10646)

[ca...@apache.org]

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

caishunfeng pushed a commit to branch 2.0.6-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/2.0.6-prepare by this push:
     new a86ce45441 to #9595: fix param lost when execute failed task (#10646)
a86ce45441 is described below

commit a86ce4544117f8cd4a8d0e50073bf2e4e3fe275c
Author: zwZjut <zw...@163.com>
AuthorDate: Tue Jun 28 13:40:24 2022 +0800

    to #9595: fix param lost when execute failed task (#10646)
    
    Co-authored-by: 宏豁 <ho...@alibaba-inc.com>
---
 .../dolphinscheduler/server/master/runner/WorkflowExecuteThread.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
index 580286852b..76e44e43e0 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
@@ -921,6 +921,10 @@ public class WorkflowExecuteThread implements Runnable {
             if (allProperty.size() > 0) {
                 taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
             }
+        } else {
+            if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
+                taskInstance.setVarPool(processInstance.getVarPool());
+            }
         }
     }