This is an automated email from the ASF dual-hosted git repository.
gallardot 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 428c986314 [Fix-17838][Bug] [ApiServer] Remove WAIT_TO_RUN and add
FAILOVER while querying workflow instances (#17839)
428c986314 is described below
commit 428c9863143989f1ad31d7ba5818c904179e85d4
Author: njnu-seafish <[email protected]>
AuthorDate: Tue Jan 6 07:28:13 2026 +0800
[Fix-17838][Bug] [ApiServer] Remove WAIT_TO_RUN and add FAILOVER while
querying workflow instances (#17839)
* remove WAIT_TO_RUN and add FAILOVER
* update chinese name
* remove unused states from ui
* pnpm run lint
* restore fix
---------
Co-authored-by: 苏义超 <[email protected]>
Co-authored-by: xiangzihao <[email protected]>
---
docs/docs/en/guide/project/workflow-instance.md | 2 +-
dolphinscheduler-ui/src/common/common.ts | 14 +++++---------
dolphinscheduler-ui/src/common/types.ts | 2 +-
dolphinscheduler-ui/src/locales/en_US/home.ts | 4 ----
dolphinscheduler-ui/src/locales/en_US/project.ts | 4 +---
dolphinscheduler-ui/src/locales/zh_CN/home.ts | 4 ----
dolphinscheduler-ui/src/locales/zh_CN/project.ts | 8 +++-----
dolphinscheduler-ui/src/service/modules/executors/types.ts | 1 -
.../src/views/projects/workflow/components/dag/index.tsx | 1 -
9 files changed, 11 insertions(+), 29 deletions(-)
diff --git a/docs/docs/en/guide/project/workflow-instance.md
b/docs/docs/en/guide/project/workflow-instance.md
index ab5ec8843f..409c79be93 100644
--- a/docs/docs/en/guide/project/workflow-instance.md
+++ b/docs/docs/en/guide/project/workflow-instance.md
@@ -56,7 +56,7 @@ figure:
|-----------------------------------|------|-------|------|-------|----------------|--------|-------------|
| SUBMITTED_SUCCESS | | | √ | √ |
| | √ |
| SERIAL_WAIT | | | √ | |
| | √ |
-| WAIT_TO_RUN | | | √ | |
| | √ |
+| FAILOVER | | | | |
| | √ |
| Executing | | | √ | √ |
| | √ |
| READY PAUSE | | | | |
| | √ |
| PAUSE | √ | √ | | | √
| √ | √ |
diff --git a/dolphinscheduler-ui/src/common/common.ts
b/dolphinscheduler-ui/src/common/common.ts
index 7fb5ab6b24..939e1ca8a5 100644
--- a/dolphinscheduler-ui/src/common/common.ts
+++ b/dolphinscheduler-ui/src/common/common.ts
@@ -30,7 +30,7 @@ import {
StopOutlined,
IssuesCloseOutlined,
SendOutlined,
- HourglassOutlined
+ SwapOutlined
} from '@vicons/antd'
import { format, parseISO } from 'date-fns'
import _ from 'lodash'
@@ -112,10 +112,6 @@ export const runningType = (t: any) => [
desc: `${t('project.workflow.stop')}`,
code: 'STOP'
},
- {
- desc: `${t('project.workflow.recovery_waiting_thread')}`,
- code: 'RECOVER_WAITING_THREAD'
- },
{
desc: `${t('project.workflow.recover_serial_wait')}`,
code: 'RECOVER_SERIAL_WAIT'
@@ -368,13 +364,13 @@ export const workflowExecutionState = (
isSpin: true,
classNames: 'serial_wait'
},
- WAIT_TO_RUN: {
+ FAILOVER: {
id: 18,
- desc: `${t('project.workflow.wait_to_run')}`,
+ desc: `${t('project.workflow.failover')}`,
color: '#5102ce',
- icon: HourglassOutlined,
+ icon: SwapOutlined,
isSpin: false,
- classNames: 'wait_to_run'
+ classNames: 'failover'
}
})
diff --git a/dolphinscheduler-ui/src/common/types.ts
b/dolphinscheduler-ui/src/common/types.ts
index ba80999ebd..fa6708741b 100644
--- a/dolphinscheduler-ui/src/common/types.ts
+++ b/dolphinscheduler-ui/src/common/types.ts
@@ -39,7 +39,7 @@ export type IWorkflowExecutionState =
| 'FAILURE'
| 'SUCCESS'
| 'SERIAL_WAIT'
- | 'WAIT_TO_RUN'
+ | 'FAILOVER'
export type ITaskStateConfig = {
[key in ITaskState]: {
diff --git a/dolphinscheduler-ui/src/locales/en_US/home.ts
b/dolphinscheduler-ui/src/locales/en_US/home.ts
index 6d29faf17c..912a49f666 100644
--- a/dolphinscheduler-ui/src/locales/en_US/home.ts
+++ b/dolphinscheduler-ui/src/locales/en_US/home.ts
@@ -31,14 +31,10 @@ export default {
success: 'SUCCESS',
need_fault_tolerance: 'NEED_FAULT_TOLERANCE',
kill: 'KILL',
- waiting_thread: 'WAITING_THREAD',
waiting_depend: 'WAITING_DEPEND',
delay_execution: 'DELAY_EXECUTION',
forced_success: 'FORCED_SUCCESS',
serial_wait: 'SERIAL_WAIT',
dispatch: 'DISPATCH',
- ready_block: 'READY_BLOCK',
- block: 'BLOCK',
- wait_to_run: 'WAIT_TO_RUN',
failover: 'FAILOVER'
}
diff --git a/dolphinscheduler-ui/src/locales/en_US/project.ts
b/dolphinscheduler-ui/src/locales/en_US/project.ts
index 801ec026a4..916893b02a 100644
--- a/dolphinscheduler-ui/src/locales/en_US/project.ts
+++ b/dolphinscheduler-ui/src/locales/en_US/project.ts
@@ -174,7 +174,6 @@ export default {
rerun: 'Rerun',
stop: 'Stop',
pause: 'Pause',
- recovery_waiting_thread: 'Recovery waiting thread',
recover_serial_wait: 'Recover serial wait',
execute_task: 'Execute the specified task',
dynamic_generation: 'Dynamic Generation',
@@ -190,7 +189,6 @@ export default {
failed: 'Failed',
need_fault_tolerance: 'Need fault tolerance',
kill: 'Kill',
- waiting_for_thread: 'Waiting for thread',
waiting_for_dependence: 'Waiting for dependence',
waiting_for_dependency_to_complete: 'Waiting for dependency to complete',
delay_execution: 'Delay execution',
@@ -230,7 +228,7 @@ export default {
'Can not find any relations of workflows.',
workflow_relation_no_data_result_desc:
'There is not any workflows. Please create a workflow, and then visit
this page again.',
- wait_to_run: 'Wait to run',
+ failover: 'Failover',
confirm_to_online: 'Confirm to make the workflow online?',
confirm_to_offline: 'Confirm to make the workflow offline?',
time_to_online: 'Confirm to make the Scheduler online?',
diff --git a/dolphinscheduler-ui/src/locales/zh_CN/home.ts
b/dolphinscheduler-ui/src/locales/zh_CN/home.ts
index 2e40f9fcf1..0cc8345d16 100644
--- a/dolphinscheduler-ui/src/locales/zh_CN/home.ts
+++ b/dolphinscheduler-ui/src/locales/zh_CN/home.ts
@@ -31,14 +31,10 @@ export default {
success: '成功',
need_fault_tolerance: '需要容错',
kill: 'KILL',
- waiting_thread: '等待线程',
waiting_depend: '等待依赖完成',
delay_execution: '延时执行',
forced_success: '强制成功',
serial_wait: '串行等待',
dispatch: '派发',
- ready_block: '准备阻断',
- block: '阻断',
- wait_to_run: '等待执行',
failover: '恢复容错'
}
diff --git a/dolphinscheduler-ui/src/locales/zh_CN/project.ts
b/dolphinscheduler-ui/src/locales/zh_CN/project.ts
index 3c7edacf76..46fd12e348 100644
--- a/dolphinscheduler-ui/src/locales/zh_CN/project.ts
+++ b/dolphinscheduler-ui/src/locales/zh_CN/project.ts
@@ -44,7 +44,7 @@ export default {
total_items: '总条目为'
},
workflow: {
- on_line: '线上',
+ on_line: '上线',
test: '测试',
operating_environment: '运行环境',
workflow_relation: '工作流关系',
@@ -173,7 +173,6 @@ export default {
rerun: '重跑',
stop: '停止',
pause: '暂停',
- recovery_waiting_thread: '恢复等待线程',
recover_serial_wait: '串行恢复',
execute_task: '执行指定任务',
dynamic_generation: '动态生成',
@@ -189,7 +188,6 @@ export default {
failed: '失败',
need_fault_tolerance: '需要容错',
kill: 'Kill',
- waiting_for_thread: '等待线程',
waiting_for_dependence: '等待依赖',
waiting_for_dependency_to_complete: '等待依赖完成',
delay_execution: '延时执行',
@@ -228,7 +226,7 @@ export default {
workflow_relation_no_data_result_title: '工作流关系不存在',
workflow_relation_no_data_result_desc:
'目前没有任何工作流，请先创建工作流，再访问该页面',
- wait_to_run: '等待执行',
+ failover: '恢复容错',
confirm_to_online: '是否确定上线该工作流?',
confirm_to_offline: '是否确定下线该工作流?',
time_to_online: '是否确定上线该定时?',
@@ -247,7 +245,7 @@ export default {
warning_too_large_parallelism_number: '并行度设置太大了, 最好不要超过10.'
},
task: {
- on_line: '线上',
+ on_line: '上线',
test: '测试',
operating_environment: '运行环境',
cancel_full_screen: '取消全屏',
diff --git a/dolphinscheduler-ui/src/service/modules/executors/types.ts
b/dolphinscheduler-ui/src/service/modules/executors/types.ts
index a443d30066..10168380f7 100644
--- a/dolphinscheduler-ui/src/service/modules/executors/types.ts
+++ b/dolphinscheduler-ui/src/service/modules/executors/types.ts
@@ -34,7 +34,6 @@ type Exec =
| 'REPEAT_RUNNING'
| 'PAUSE'
| 'STOP'
- | 'RECOVER_WAITING_THREAD'
interface ExecuteReq {
executeType: Execute
diff --git
a/dolphinscheduler-ui/src/views/projects/workflow/components/dag/index.tsx
b/dolphinscheduler-ui/src/views/projects/workflow/components/dag/index.tsx
index 52db69407d..d65a3e410b 100644
--- a/dolphinscheduler-ui/src/views/projects/workflow/components/dag/index.tsx
+++ b/dolphinscheduler-ui/src/views/projects/workflow/components/dag/index.tsx
@@ -143,7 +143,6 @@ export default defineComponent({
const menuDisplay = computed(() => {
if (props.instance) {
return (
- props.instance.state === 'WAITING_THREAD' ||
props.instance.state === 'SUCCESS' ||
props.instance.state === 'PAUSE' ||
props.instance.state === 'FAILURE' ||
