Browse Source

Fix task instance will generate multiple times when retry interval is 0/s (#13571)

3.2.0-release
Wenjun Ruan 2 years ago committed by GitHub
parent
commit
e8b20def54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 11
      dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskStateEventHandler.java

11
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskStateEventHandler.java

@ -57,10 +57,19 @@ public class TaskStateEventHandler implements StateEventHandler {
task.getState(), taskStateEvent.getStatus()); task.getState(), taskStateEvent.getStatus());
Map<Long, Integer> completeTaskMap = workflowExecuteRunnable.getCompleteTaskMap(); Map<Long, Integer> completeTaskMap = workflowExecuteRunnable.getCompleteTaskMap();
if (task.getState().isFinished()
&& (taskStateEvent.getStatus() != null && taskStateEvent.getStatus().isRunning())) {
String errorMessage = String.format(
"The current task instance state is %s, but the task state event status is %s, so the task state event will be ignored",
task.getState(),
taskStateEvent.getStatus());
log.warn(errorMessage);
throw new StateEventHandleError(errorMessage);
}
if (task.getState().isFinished()) { if (task.getState().isFinished()) {
if (completeTaskMap.containsKey(task.getTaskCode()) if (completeTaskMap.containsKey(task.getTaskCode())
&& completeTaskMap.get(task.getTaskCode()) == task.getId()) { && completeTaskMap.get(task.getTaskCode()).equals(task.getId())) {
log.warn("The task instance is already complete, stateEvent: {}", stateEvent); log.warn("The task instance is already complete, stateEvent: {}", stateEvent);
return true; return true;
} }

Loading…
Cancel
Save