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 62b85b9cb3 [Fix] Fix the timeout alarm button is invalid (#10260)
62b85b9cb3 is described below
commit 62b85b9cb3110290519966743c40d0f40ce6af3b
Author: juzimao <[email protected]>
AuthorDate: Fri May 27 16:39:08 2022 +0800
[Fix] Fix the timeout alarm button is invalid (#10260)
---
.../src/views/projects/task/components/node/tasks/use-conditions.ts | 3 ++-
.../src/views/projects/task/components/node/tasks/use-datax.ts | 3 ++-
.../src/views/projects/task/components/node/tasks/use-emr.ts | 3 ++-
.../src/views/projects/task/components/node/tasks/use-flink.ts | 3 ++-
.../src/views/projects/task/components/node/tasks/use-http.ts | 3 ++-
.../src/views/projects/task/components/node/tasks/use-jupyter.ts | 3 ++-
.../src/views/projects/task/components/node/tasks/use-k8s.ts | 3 ++-
.../src/views/projects/task/components/node/tasks/use-mlflow.ts | 3 ++-
.../src/views/projects/task/components/node/tasks/use-mr.ts | 3 ++-
.../src/views/projects/task/components/node/tasks/use-pigeon.ts | 3 ++-
.../src/views/projects/task/components/node/tasks/use-procedure.ts | 3 ++-
.../src/views/projects/task/components/node/tasks/use-python.ts | 3 ++-
.../src/views/projects/task/components/node/tasks/use-sea-tunnel.ts | 3 ++-
.../src/views/projects/task/components/node/tasks/use-spark.ts | 3 ++-
.../src/views/projects/task/components/node/tasks/use-sql.ts | 3 ++-
.../src/views/projects/task/components/node/tasks/use-sqoop.ts | 3 ++-
.../src/views/projects/task/components/node/tasks/use-sub-process.ts | 3 ++-
.../src/views/projects/task/components/node/tasks/use-switch.ts | 3 ++-
.../src/views/projects/task/components/node/tasks/use-zeppelin.ts | 3 ++-
19 files changed, 38 insertions(+), 19 deletions(-)
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-conditions.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-conditions.ts
index 69f8adaf19..fa6124f67c 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-conditions.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-conditions.ts
@@ -46,7 +46,8 @@ export function useConditions({
dependTaskList: [],
preTasks: [],
successNode: 'success',
- failedNode: 'failed'
+ failedNode: 'failed',
+ timeoutNotifyStrategy: ['WARN']
} as INodeData)
let extra: IJsonItem[] = []
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-datax.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-datax.ts
index 4b69960b51..d37b78552b 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-datax.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-datax.ts
@@ -48,7 +48,8 @@ export function useDataX({
dsType: 'MYSQL',
dtType: 'MYSQL',
preStatements: [],
- postStatements: []
+ postStatements: [],
+ timeoutNotifyStrategy: ['WARN']
} as INodeData)
let extra: IJsonItem[] = []
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-emr.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-emr.ts
index 3ce2fead6c..1face687fb 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-emr.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-emr.ts
@@ -43,7 +43,8 @@ export function useEmr({
failRetryTimes: 0,
workerGroup: 'default',
delayTime: 0,
- timeout: 30
+ timeout: 30,
+ timeoutNotifyStrategy: ['WARN']
} as INodeData)
let extra: IJsonItem[] = []
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-flink.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-flink.ts
index acf41992c8..b3c455971f 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-flink.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-flink.ts
@@ -52,7 +52,8 @@ export function useFlink({
taskManagerMemory: '2G',
slot: 1,
taskManager: 2,
- parallelism: 1
+ parallelism: 1,
+ timeoutNotifyStrategy: ['WARN']
})
let extra: IJsonItem[] = []
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-http.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-http.ts
index 89dd2394e6..109258dfce 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-http.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-http.ts
@@ -49,7 +49,8 @@ export function useHttp({
url: '',
condition: '',
connectTimeout: 60000,
- socketTimeout: 60000
+ socketTimeout: 60000,
+ timeoutNotifyStrategy: ['WARN']
} as INodeData)
let extra: IJsonItem[] = []
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-jupyter.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-jupyter.ts
index b81ff1b2d1..93ff593015 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-jupyter.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-jupyter.ts
@@ -42,7 +42,8 @@ export function useJupyter({
failRetryTimes: 0,
workerGroup: 'default',
delayTime: 0,
- timeout: 30
+ timeout: 30,
+ timeoutNotifyStrategy: ['WARN']
} as INodeData)
let extra: IJsonItem[] = []
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-k8s.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-k8s.ts
index a55425ffb5..c61816505e 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-k8s.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-k8s.ts
@@ -43,7 +43,8 @@ export function useK8s({
failRetryTimes: 0,
workerGroup: 'default',
delayTime: 0,
- timeout: 30
+ timeout: 30,
+ timeoutNotifyStrategy: ['WARN']
} as INodeData)
let extra: IJsonItem[] = []
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-mlflow.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-mlflow.ts
index 10bb1893c9..9a748d7095 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-mlflow.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-mlflow.ts
@@ -51,7 +51,8 @@ export function useMlflow({
automlTool: 'flaml',
mlflowCustomProjectParameters: [],
delayTime: 0,
- timeout: 30
+ timeout: 30,
+ timeoutNotifyStrategy: ['WARN']
} as INodeData)
let extra: IJsonItem[] = []
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-mr.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-mr.ts
index f5bbdeca59..adf40762f7 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-mr.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-mr.ts
@@ -43,7 +43,8 @@ export function useMr({
workerGroup: 'default',
delayTime: 0,
timeout: 30,
- programType: 'SCALA'
+ programType: 'SCALA',
+ timeoutNotifyStrategy: ['WARN']
} as INodeData)
let extra: IJsonItem[] = []
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-pigeon.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-pigeon.ts
index 4bd9eedd42..0d9e471380 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-pigeon.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-pigeon.ts
@@ -42,7 +42,8 @@ export function usePigeon({
workerGroup: 'default',
delayTime: 0,
timeout: 30,
- targetJobName: ''
+ targetJobName: '',
+ timeoutNotifyStrategy: ['WARN']
} as INodeData)
let extra: IJsonItem[] = []
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-procedure.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-procedure.ts
index 1ace30e0e9..ecf6d2e345 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-procedure.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-procedure.ts
@@ -46,7 +46,8 @@ export function useProcedure({
timeout: 30,
type: data?.taskParams?.type ? data?.taskParams?.type : 'MYSQL',
datasource: data?.taskParams?.datasource,
- method: data?.taskParams?.method
+ method: data?.taskParams?.method,
+ timeoutNotifyStrategy: ['WARN']
} as INodeData)
let extra: IJsonItem[] = []
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-python.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-python.ts
index 2f58a13257..9bca92bef6 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-python.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-python.ts
@@ -44,7 +44,8 @@ export function usePython({
workerGroup: 'default',
delayTime: 0,
timeout: 30,
- rawScript: ''
+ rawScript: '',
+ timeoutNotifyStrategy: ['WARN']
} as INodeData)
let extra: IJsonItem[] = []
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-sea-tunnel.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-sea-tunnel.ts
index 85fedf8d3b..f0b87c48fe 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-sea-tunnel.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-sea-tunnel.ts
@@ -48,7 +48,8 @@ export function useSeaTunnel({
queue: 'default',
master: 'yarn',
masterUrl: '',
- resourceFiles: []
+ resourceFiles: [],
+ timeoutNotifyStrategy: ['WARN']
} as INodeData)
let extra: IJsonItem[] = []
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-spark.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-spark.ts
index 46061ffc9c..054709de55 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-spark.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-spark.ts
@@ -51,7 +51,8 @@ export function useSpark({
driverMemory: '512M',
numExecutors: 2,
executorMemory: '2G',
- executorCores: 2
+ executorCores: 2,
+ timeoutNotifyStrategy: ['WARN']
} as INodeData)
let extra: IJsonItem[] = []
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-sql.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-sql.ts
index 63111d54fe..fa6a6a1e03 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-sql.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-sql.ts
@@ -51,7 +51,8 @@ export function useSql({
sqlType: '0',
preStatements: [],
postStatements: [],
- udfs: []
+ udfs: [],
+ timeoutNotifyStrategy: ['WARN']
} as INodeData)
let extra: IJsonItem[] = []
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-sqoop.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-sqoop.ts
index fc385372b1..6e69ddc306 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-sqoop.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-sqoop.ts
@@ -62,7 +62,8 @@ export function useSqoop({
targetHiveCreateTable: false,
targetHiveDropDelimiter: false,
targetHiveOverWrite: true,
- concurrency: 1
+ concurrency: 1,
+ timeoutNotifyStrategy: ['WARN']
} as INodeData)
let extra: IJsonItem[] = []
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-sub-process.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-sub-process.ts
index 7338da437b..ff77e3762e 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-sub-process.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-sub-process.ts
@@ -45,7 +45,8 @@ export function useSubProcess({
failRetryTimes: 0,
workerGroup: 'default',
delayTime: 0,
- timeout: 30
+ timeout: 30,
+ timeoutNotifyStrategy: ['WARN']
} as INodeData)
let extra: IJsonItem[] = []
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-switch.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-switch.ts
index 20412242c0..34f054d1b1 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-switch.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-switch.ts
@@ -46,7 +46,8 @@ export function useSwitch({
rawScript: '',
switchResult: {},
dependTaskList: [],
- nextNode: undefined
+ nextNode: undefined,
+ timeoutNotifyStrategy: ['WARN']
} as INodeData)
let extra: IJsonItem[] = []
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-zeppelin.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-zeppelin.ts
index 7e96d46d12..d97d54ec3c 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-zeppelin.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-zeppelin.ts
@@ -42,7 +42,8 @@ export function useZeppelin({
failRetryTimes: 0,
workerGroup: 'default',
delayTime: 0,
- timeout: 30
+ timeout: 30,
+ timeoutNotifyStrategy: ['WARN']
} as INodeData)
let extra: IJsonItem[] = []
