natas_hw
/
dolphinscheduler
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Bug-7788][MasterServer] fix submit duplicate tasks sometimes when retry (#7808) (#7866) 

* [Bug-7788] fix submit duplicate tasks sometimes when retry

* add exist check when add task to standby list

* update

* put queue contain judge first

Co-authored-by: caishunfeng <534328519@qq.com>

Co-authored-by: caishunfeng <534328519@qq.com>
This commit is contained in:
wind 2022-01-07 10:42:01 +08:00 committed by GitHub
parent 1d3f77bedb
commit 5592e7bb7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
View File

@ -76,6 +76,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
@ -1171,13 +1172,35 @@ public class WorkflowExecuteThread implements Runnable {
* @param taskInstance task instance
*/
private void addTaskToStandByList(TaskInstance taskInstance) {
logger.info("add task to stand by list, task name: {} , task id:{}", taskInstance.getName(), taskInstance.getId());
try {
if (!readyToSubmitTaskQueue.contains(taskInstance)) {
readyToSubmitTaskQueue.put(taskInstance);
if (readyToSubmitTaskQueue.contains(taskInstance)) {
logger.warn("task was found in ready submit queue, task code:{}", taskInstance.getTaskCode());
return;
}
// need to check if the tasks with same task code is active
boolean active = false;
Map<Integer, TaskInstance> taskInstanceMap = taskInstanceHashMap.column(taskInstance.getTaskCode());
if (taskInstanceMap != null && taskInstanceMap.size() > 0) {
for (Entry<Integer, TaskInstance> entry : taskInstanceMap.entrySet()) {
Integer taskInstanceId = entry.getKey();
if (activeTaskProcessorMaps.containsKey(taskInstanceId)) {
TaskInstance latestTaskInstance = processService.findTaskInstanceById(taskInstanceId);
if (latestTaskInstance != null && !latestTaskInstance.getState().typeIsFailure()) {
active = true;
break;
}
}
}
}
if (active) {
logger.warn("task was found in active task list, task code:{}", taskInstance.getTaskCode());
return;
}
logger.info("add task to stand by list, task name:{}, task id:{}, task code:{}",
taskInstance.getName(), taskInstance.getId(), taskInstance.getTaskCode());
readyToSubmitTaskQueue.put(taskInstance);
} catch (Exception e) {
logger.error("add task instance to readyToSubmitTaskQueue, taskName: {}, task id: {}", taskInstance.getName(), taskInstance.getId(), e);
logger.error("add task instance to readyToSubmitTaskQueue, taskName:{}, task id:{}", taskInstance.getName(), taskInstance.getId(), e);
}
}