任务触发参数优化
This commit is contained in:
parent
4db870c8a8
commit
11a4c4ae91
|
@ -2064,7 +2064,7 @@ data: post-data
|
||||||
- 18、执行器Commandhandler示例任务优化,修复极端情况下脚本进程挂起问题;
|
- 18、执行器Commandhandler示例任务优化,修复极端情况下脚本进程挂起问题;
|
||||||
- 19、调度中心页面交互优化:用户管理模块密码列取消;多处表达autocomplete取消;执行器管理模块XSS拦截校验等;
|
- 19、调度中心页面交互优化:用户管理模块密码列取消;多处表达autocomplete取消;执行器管理模块XSS拦截校验等;
|
||||||
- 20、执行器注册组件优化:注册逻辑调整为异步方式,提高注册性能;
|
- 20、执行器注册组件优化:注册逻辑调整为异步方式,提高注册性能;
|
||||||
- 21、[ING]任务触发参数优化:支持选择 "Cron触发"、"固定间隔时间触发"、"指定时间点触发"、"不选择" 等;
|
- 21、[ING]任务触发参数优化:支持选择 "无(API/人工)","Cron触发"、"固定间隔"、"固定延时"等;
|
||||||
- 22、[ING]任务 misfire 策略:忽略、补偿一次等;
|
- 22、[ING]任务 misfire 策略:忽略、补偿一次等;
|
||||||
|
|
||||||
|
|
||||||
|
@ -2107,6 +2107,13 @@ data: post-data
|
||||||
- 23、AccessToken按照执行器维度设置;控制调度、回调;
|
- 23、AccessToken按照执行器维度设置;控制调度、回调;
|
||||||
- 24、新增执行器描述属性;任务名称属性;
|
- 24、新增执行器描述属性;任务名称属性;
|
||||||
- 25、自定义失败重试时间间隔;
|
- 25、自定义失败重试时间间隔;
|
||||||
|
- 26、任务日志重构:一次调度只记录一条主任务,维护起止时间和状态。
|
||||||
|
- 普通任务:只记录一条主任务;
|
||||||
|
- 广播任务:记录一条主任务,每个分片任务记录一条次任务,关联在主任务上;
|
||||||
|
- 重试任务:失败时,新增主任务。所有调度记录,包括入口调度和重试调度,均挂载主任务上。
|
||||||
|
- 27、调度声明周期:调度、执行、回调、结果处理(公共逻辑:重试、fixdelay);
|
||||||
|
- 28、任务标签:方便搜索;
|
||||||
|
- 29、执行器:dag执行器,不需要注册机器;
|
||||||
|
|
||||||
|
|
||||||
## 八、其他
|
## 八、其他
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
package com.xxl.job.admin.core.scheduler;
|
package com.xxl.job.admin.core.scheduler;
|
||||||
|
|
||||||
|
import com.xxl.job.admin.core.util.I18nUtil;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author xuxueli 2020-10-29 21:11:23
|
* @author xuxueli 2020-10-29 21:11:23
|
||||||
*/
|
*/
|
||||||
|
@ -8,12 +10,22 @@ public enum MisfireStrategyEnum {
|
||||||
/**
|
/**
|
||||||
* do nothing
|
* do nothing
|
||||||
*/
|
*/
|
||||||
DO_NOTHING,
|
DO_NOTHING(I18nUtil.getString("misfire_strategy_do_nothing")),
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* fire once now
|
* fire once now
|
||||||
*/
|
*/
|
||||||
FIRE_ONCE_NOW;
|
FIRE_ONCE_NOW(I18nUtil.getString("misfire_strategy_fire_once_now"));
|
||||||
|
|
||||||
|
private String title;
|
||||||
|
|
||||||
|
MisfireStrategyEnum(String title) {
|
||||||
|
this.title = title;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getTitle() {
|
||||||
|
return title;
|
||||||
|
}
|
||||||
|
|
||||||
public static MisfireStrategyEnum match(String name){
|
public static MisfireStrategyEnum match(String name){
|
||||||
for (MisfireStrategyEnum item: MisfireStrategyEnum.values()) {
|
for (MisfireStrategyEnum item: MisfireStrategyEnum.values()) {
|
||||||
|
|
|
@ -1,26 +1,38 @@
|
||||||
package com.xxl.job.admin.core.scheduler;
|
package com.xxl.job.admin.core.scheduler;
|
||||||
|
|
||||||
|
import com.xxl.job.admin.core.util.I18nUtil;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author xuxueli 2020-10-29 21:11:23
|
* @author xuxueli 2020-10-29 21:11:23
|
||||||
*/
|
*/
|
||||||
public enum ScheduleTypeEnum {
|
public enum ScheduleTypeEnum {
|
||||||
|
|
||||||
NONE,
|
NONE(I18nUtil.getString("schedule_type_none")),
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* schedule by cron
|
* schedule by cron
|
||||||
*/
|
*/
|
||||||
CRON,
|
CRON(I18nUtil.getString("schedule_type_cron")),
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* schedule by fixed rate (in seconds)
|
* schedule by fixed rate (in seconds)
|
||||||
*/
|
*/
|
||||||
FIX_RATE,
|
FIX_RATE(I18nUtil.getString("schedule_type_fix_rate")),
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* schedule by fix delay (in seconds), after the last time
|
* schedule by fix delay (in seconds), after the last time
|
||||||
*/
|
*/
|
||||||
FIX_DELAY;
|
FIX_DELAY(I18nUtil.getString("schedule_type_fix_delay"));
|
||||||
|
|
||||||
|
private String title;
|
||||||
|
|
||||||
|
ScheduleTypeEnum(String title) {
|
||||||
|
this.title = title;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getTitle() {
|
||||||
|
return title;
|
||||||
|
}
|
||||||
|
|
||||||
public static ScheduleTypeEnum match(String name){
|
public static ScheduleTypeEnum match(String name){
|
||||||
for (ScheduleTypeEnum item: ScheduleTypeEnum.values()) {
|
for (ScheduleTypeEnum item: ScheduleTypeEnum.values()) {
|
||||||
|
|
|
@ -144,6 +144,14 @@ jobinfo_glue_rollback=Version Backtrack
|
||||||
jobinfo_glue_jobid_unvalid=Job ID is illegal
|
jobinfo_glue_jobid_unvalid=Job ID is illegal
|
||||||
jobinfo_glue_gluetype_unvalid=The job is not GLUE Type
|
jobinfo_glue_gluetype_unvalid=The job is not GLUE Type
|
||||||
jobinfo_field_executorTimeout_placeholder=Job Timeout period,in seconds. effect if greater than zero
|
jobinfo_field_executorTimeout_placeholder=Job Timeout period,in seconds. effect if greater than zero
|
||||||
|
schedule_type=Schedule Type
|
||||||
|
schedule_type_none=None
|
||||||
|
schedule_type_cron=Cron
|
||||||
|
schedule_type_fix_rate=Fix rate
|
||||||
|
schedule_type_fix_delay=Fix delay
|
||||||
|
misfire_strategy=Misfire strategy
|
||||||
|
misfire_strategy_do_nothing=Do nothing
|
||||||
|
misfire_strategy_fire_once_now=Fire once now
|
||||||
|
|
||||||
## job log
|
## job log
|
||||||
joblog_name=Trigger Log
|
joblog_name=Trigger Log
|
||||||
|
|
|
@ -144,6 +144,14 @@ jobinfo_glue_rollback=版本回溯
|
||||||
jobinfo_glue_jobid_unvalid=任务ID非法
|
jobinfo_glue_jobid_unvalid=任务ID非法
|
||||||
jobinfo_glue_gluetype_unvalid=该任务非GLUE模式
|
jobinfo_glue_gluetype_unvalid=该任务非GLUE模式
|
||||||
jobinfo_field_executorTimeout_placeholder=任务超时时间,单位秒,大于零时生效
|
jobinfo_field_executorTimeout_placeholder=任务超时时间,单位秒,大于零时生效
|
||||||
|
schedule_type=调度类型
|
||||||
|
schedule_type_none=无
|
||||||
|
schedule_type_cron=CRON
|
||||||
|
schedule_type_fix_rate=固定速度
|
||||||
|
schedule_type_fix_delay=固定延迟
|
||||||
|
misfire_strategy=调度过期策略
|
||||||
|
misfire_strategy_do_nothing=忽略
|
||||||
|
misfire_strategy_fire_once_now=立即执行一次
|
||||||
|
|
||||||
## job log
|
## job log
|
||||||
joblog_name=调度日志
|
joblog_name=调度日志
|
||||||
|
|
|
@ -144,6 +144,14 @@ jobinfo_glue_rollback=版本回復
|
||||||
jobinfo_glue_jobid_unvalid=任務ID非法
|
jobinfo_glue_jobid_unvalid=任務ID非法
|
||||||
jobinfo_glue_gluetype_unvalid=該任務非GLUE模式
|
jobinfo_glue_gluetype_unvalid=該任務非GLUE模式
|
||||||
jobinfo_field_executorTimeout_placeholder=任務超時時間,單位秒,大於零時生效
|
jobinfo_field_executorTimeout_placeholder=任務超時時間,單位秒,大於零時生效
|
||||||
|
schedule_type=調度類型
|
||||||
|
schedule_type_none=無
|
||||||
|
schedule_type_cron=CRON
|
||||||
|
schedule_type_fix_rate=固定速度
|
||||||
|
schedule_type_fix_delay=固定延遲
|
||||||
|
misfire_strategy=調度過期策略
|
||||||
|
misfire_strategy_do_nothing=忽略
|
||||||
|
misfire_strategy_fire_once_now=立即執行壹次
|
||||||
|
|
||||||
## job log
|
## job log
|
||||||
joblog_name=調度日誌
|
joblog_name=調度日誌
|
||||||
|
|
Loading…
Reference in New Issue