Merge branch 'dev' into #6807

zwZjut · web-flow · commit be06336d7c7e · 2021-11-12T15:34:28.000+08:00
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistryClient.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistryClient.java
@@ -309,8 +309,9 @@ private void failoverWorker(String workerHost, boolean needCheckWorkerAlive, boo
 
                 taskInstance.setState(ExecutionStatus.NEED_FAULT_TOLERANCE);
                 processService.saveTaskInstance(taskInstance);
+
                 if (!processInstanceExecCacheManager.contains(processInstance.getId())) {
-                    return;
+                    continue;
                 }
                 WorkflowExecuteThread workflowExecuteThreadNotify = processInstanceExecCacheManager.getByProcessInstanceId(processInstance.getId());
                 StateEvent stateEvent = new StateEvent();
