From 04f3aa97135d79469daf7c21c935029faff827b2 Mon Sep 17 00:00:00 2001 From: Wenjun Ruan Date: Tue, 2 Aug 2022 09:30:18 +0800 Subject: [PATCH] Fix recovery from failed task will dead loop (#11239) --- .../master/runner/WorkflowExecuteRunnable.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java index f2965f79f5..7f98e07453 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java @@ -83,7 +83,6 @@ import org.apache.dolphinscheduler.service.process.ProcessService; import org.apache.dolphinscheduler.service.queue.PeerTaskInstancePriorityQueue; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; @@ -1818,10 +1817,13 @@ public class WorkflowExecuteRunnable implements Callable { // todo: Can we use a better way to set the recover taskInstanceId list? rather then use the cmdParam if (paramMap != null && paramMap.containsKey(CMD_PARAM_RECOVERY_START_NODE_STRING)) { - String[] idList = paramMap.get(CMD_PARAM_RECOVERY_START_NODE_STRING).split(Constants.COMMA); - if (ArrayUtils.isNotEmpty(idList)) { - List taskInstanceIds = Arrays.stream(idList).map(Integer::valueOf).collect(Collectors.toList()); - return processService.findTaskInstanceByIdList(taskInstanceIds); + List startTaskInstanceIds = Arrays.stream(paramMap.get(CMD_PARAM_RECOVERY_START_NODE_STRING) + .split(COMMA)) + .filter(StringUtils::isNotEmpty) + .map(Integer::valueOf) + .collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(startTaskInstanceIds)) { + return processService.findTaskInstanceByIdList(startTaskInstanceIds); } } return Collections.emptyList();