natas_hw
/
dolphinscheduler
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Fix-7070][UI] Remedy the issue with no saving the timeout's strategy into the database. (#7107) (#7150) 

Co-authored-by: Hua Jiang <jianghuachinacom@163.com>
This commit is contained in:
wind 2021-12-03 18:16:39 +08:00 committed by GitHub
parent 423d7ea3a1
commit 659d2bb4b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskDefinition.java
View File

@ -31,6 +31,7 @@ import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
@ -157,6 +158,7 @@ public class TaskDefinition {
/** /**
* timeout notify strategy * timeout notify strategy
*/ */
@TableField(updateStrategy = FieldStrategy.IGNORED)
private TaskTimeoutStrategy timeoutNotifyStrategy; private TaskTimeoutStrategy timeoutNotifyStrategy;
/** /**

24
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/timeoutAlarm.vue
View File

@ -60,7 +60,11 @@
<script> <script>
import _ from 'lodash' import _ from 'lodash'
import disabledState from '@/module/mixin/disabledState' import disabledState from '@/module/mixin/disabledState'
const StrategyMap = {
WARN: 'WARN',
FAILED: 'FAILED',
WARNFAILED: 'WARNFAILED'
}
export default { export default {
name: 'form-timeout-alarm', name: 'form-timeout-alarm',
data () { data () {
@ -100,10 +104,12 @@
strategy: (() => { strategy: (() => {
// Handling checkout sequence // Handling checkout sequence
let strategy = this.strategy let strategy = this.strategy
if (strategy.length === 2 && strategy[0] === 'FAILED') { if (strategy.length > 1) {
return [strategy[1], strategy[0]].join(',') return StrategyMap.WARNFAILED
} else if (strategy.length === 1) {
return strategy[0]
} else { } else {
return strategy.join(',') return ''
} }
})(), })(),
interval: parseInt(this.interval), interval: parseInt(this.interval),
@ -119,7 +125,15 @@
// Non-null objects represent backfill // Non-null objects represent backfill
if (!_.isEmpty(o) && o.timeout) { if (!_.isEmpty(o) && o.timeout) {
this.enable = o.timeout.enable || false this.enable = o.timeout.enable || false
this.strategy = _.split(o.timeout.strategy, ',') || ['WARN'] if (o.timeout.strategy) {
if (o.timeout.strategy === StrategyMap.WARNFAILED) {
this.strategy = [StrategyMap.WARN, StrategyMap.FAILED]
} else {
this.strategy = [o.timeout.strategy]
}
} else {
this.strategy = [StrategyMap.WARN]
}
this.interval = o.timeout.interval || null this.interval = o.timeout.interval || null
} }
}, },