You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by so...@apache.org on 2022/04/18 12:34:27 UTC
[dolphinscheduler] branch dev updated: [Fix][Master Server] handle warn+failed timeout strategy in workflow execute thread of master server (#8077) (#9485)
This is an automated email from the ASF dual-hosted git repository.
songjian pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 508ed9769a [Fix][Master Server] handle warn+failed timeout strategy in workflow execute thread of master server (#8077) (#9485)
508ed9769a is described below
commit 508ed9769aebe70a87539eccb70b6a08d34e0183
Author: sparklezzz <zh...@gmail.com>
AuthorDate: Mon Apr 18 20:34:22 2022 +0800
[Fix][Master Server] handle warn+failed timeout strategy in workflow execute thread of master server (#8077) (#9485)
Co-authored-by: xudong.zhang <xu...@nio.com>
---
.../dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
index 75a621bd43..8e20f92ead 100644
--- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
+++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
@@ -382,10 +382,11 @@ public class WorkflowExecuteThread {
return true;
}
TaskTimeoutStrategy taskTimeoutStrategy = taskInstance.getTaskDefine().getTimeoutNotifyStrategy();
- if (TaskTimeoutStrategy.FAILED == taskTimeoutStrategy) {
+ if (TaskTimeoutStrategy.FAILED == taskTimeoutStrategy || TaskTimeoutStrategy.WARNFAILED == taskTimeoutStrategy) {
ITaskProcessor taskProcessor = activeTaskProcessorMaps.get(taskInstance.getTaskCode());
taskProcessor.action(TaskAction.TIMEOUT);
- } else {
+ }
+ if (TaskTimeoutStrategy.WARN == taskTimeoutStrategy || TaskTimeoutStrategy.WARNFAILED == taskTimeoutStrategy) {
ProjectUser projectUser = processService.queryProjectWithUserByProcessInstanceId(processInstance.getId());
processAlertManager.sendTaskTimeoutAlert(processInstance, taskInstance, projectUser);
}