You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ke...@apache.org on 2022/12/14 01:54:17 UTC
[dolphinscheduler] branch 3.1.3-prepare updated: fix retry task failure (#13077)
This is an automated email from the ASF dual-hosted git repository.
kerwin pushed a commit to branch 3.1.3-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/3.1.3-prepare by this push:
new 83e2c14be1 fix retry task failure (#13077)
83e2c14be1 is described below
commit 83e2c14be116552d93f399def32d1cb2c89a479b
Author: JieguangZhou <ji...@163.com>
AuthorDate: Mon Dec 5 21:22:51 2022 +0800
fix retry task failure (#13077)
---
.../server/master/event/TaskRetryStateEventHandler.java | 2 +-
.../dolphinscheduler/server/master/runner/StateWheelExecuteThread.java | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskRetryStateEventHandler.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskRetryStateEventHandler.java
index 1d5f7a3883..8644b2e2d8 100644
--- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskRetryStateEventHandler.java
+++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskRetryStateEventHandler.java
@@ -37,7 +37,7 @@ public class TaskRetryStateEventHandler implements StateEventHandler {
StateEvent stateEvent) throws StateEventHandleException {
TaskStateEvent taskStateEvent = (TaskStateEvent) stateEvent;
- logger.info("Handle task instance retry event, taskInstanceId: {}", taskStateEvent.getTaskInstanceId());
+ logger.info("Handle task instance retry event, taskCode: {}", taskStateEvent.getTaskCode());
TaskMetrics.incTaskInstanceByState("retry");
Map<Long, TaskInstance> waitToRetryTaskInstanceMap = workflowExecuteRunnable.getWaitToRetryTaskInstanceMap();
diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/StateWheelExecuteThread.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/StateWheelExecuteThread.java
index 760c722971..518ccbb035 100644
--- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/StateWheelExecuteThread.java
+++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/StateWheelExecuteThread.java
@@ -419,7 +419,6 @@ public class StateWheelExecuteThread extends BaseDaemonThread {
private void addTaskRetryEvent(TaskInstance taskInstance) {
TaskStateEvent stateEvent = TaskStateEvent.builder()
.processInstanceId(taskInstance.getProcessInstanceId())
- .taskInstanceId(taskInstance.getId())
.taskCode(taskInstance.getTaskCode())
.status(TaskExecutionStatus.RUNNING_EXECUTION)
.type(StateEventType.TASK_RETRY)