[incubator-dolphinscheduler] branch dev-1.3.0 updated: Fix tasks not execute in sub-process when rerun scheduled process. #2903 (#2908)

[le...@apache.org]

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

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


The following commit(s) were added to refs/heads/dev-1.3.0 by this push:
     new 8681036  Fix tasks not execute in sub-process when rerun scheduled process. #2903 (#2908)
8681036 is described below

commit 8681036a499331966c90ee013b4f1f796907c170
Author: t1mon <17...@qq.com>
AuthorDate: Fri Jun 5 18:42:10 2020 +0800

    Fix tasks not execute in sub-process when rerun scheduled process. #2903 (#2908)
---
 .../org/apache/dolphinscheduler/service/process/ProcessService.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
index aa7d83f..617826c 100644
--- a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
+++ b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
@@ -921,7 +921,7 @@ public class ProcessService {
 
         CommandType fatherType = parentProcessInstance.getCommandType();
         CommandType commandType = fatherType;
-        if(childInstance == null || commandType == CommandType.REPEAT_RUNNING){
+        if(childInstance == null){
             String fatherHistoryCommand = parentProcessInstance.getHistoryCmd();
             // sub process must begin with schedule/complement data
             // if father begin with scheduler/complement data