Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
X
XXL-JOB
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
靳帅
XXL-JOB
Commits
2f640f13
提交
2f640f13
authored
6月 20, 2019
作者:
xuxueli
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update document
上级
2ad59c10
隐藏空白字符变更
内嵌
并排
正在显示
1 个修改的文件
包含
29 行增加
和
33 行删除
+29
-33
JobScheduleHelper.java
...java/com/xxl/job/admin/core/thread/JobScheduleHelper.java
+29
-33
没有找到文件。
xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java
浏览文件 @
2f640f13
...
@@ -66,16 +66,14 @@ public class JobScheduleHelper {
...
@@ -66,16 +66,14 @@ public class JobScheduleHelper {
// 1、预读5s内调度任务
// 1、预读5s内调度任务
long
maxNextTime
=
System
.
currentTimeMillis
()
+
5000
;
long
maxNextTime
=
System
.
currentTimeMillis
()
+
5000
;
long
nowTime
=
System
.
currentTimeMillis
();
List
<
XxlJobInfo
>
scheduleList
=
XxlJobAdminConfig
.
getAdminConfig
().
getXxlJobInfoDao
().
scheduleJobQuery
(
maxNextTime
);
List
<
XxlJobInfo
>
scheduleList
=
XxlJobAdminConfig
.
getAdminConfig
().
getXxlJobInfoDao
().
scheduleJobQuery
(
maxNextTime
);
if
(
scheduleList
!=
null
&&
scheduleList
.
size
()>
0
)
{
if
(
scheduleList
!=
null
&&
scheduleList
.
size
()>
0
)
{
// 2、推送时间轮
// 2、推送时间轮
for
(
XxlJobInfo
jobInfo:
scheduleList
)
{
for
(
XxlJobInfo
jobInfo:
scheduleList
)
{
// 时间轮刻度计算
// 时间轮刻度计算
int
ringSecond
=
-
1
;
if
(
System
.
currentTimeMillis
()
>
jobInfo
.
getTriggerNextTime
()
+
5000
)
{
if
(
jobInfo
.
getTriggerNextTime
()
<
nowTime
-
5000
)
{
// 过期超5s:本地忽略,当前时间开始计算下次触发时间
// 过期超5s:本地忽略,当前时间开始计算下次触发时间
ringSecond
=
-
1
;
jobInfo
.
setTriggerLastTime
(
jobInfo
.
getTriggerNextTime
());
jobInfo
.
setTriggerLastTime
(
jobInfo
.
getTriggerNextTime
());
jobInfo
.
setTriggerNextTime
(
jobInfo
.
setTriggerNextTime
(
...
@@ -83,8 +81,12 @@ public class JobScheduleHelper {
...
@@ -83,8 +81,12 @@ public class JobScheduleHelper {
.
getNextValidTimeAfter
(
new
Date
())
.
getNextValidTimeAfter
(
new
Date
())
.
getTime
()
.
getTime
()
);
);
}
else
if
(
jobInfo
.
getTriggerNextTime
()
<
nowTime
)
{
// 过期5s内:立即触发一次,当前时间开始计算下次触发时间
ringSecond
=
(
int
)((
nowTime
/
1000
)%
60
);
// pass
continue
;
}
else
if
(
System
.
currentTimeMillis
()
>
jobInfo
.
getTriggerNextTime
())
{
// 过期5s内 :立即触发一次,当前时间开始计算下次触发时间
jobInfo
.
setTriggerLastTime
(
jobInfo
.
getTriggerNextTime
());
jobInfo
.
setTriggerLastTime
(
jobInfo
.
getTriggerNextTime
());
jobInfo
.
setTriggerNextTime
(
jobInfo
.
setTriggerNextTime
(
...
@@ -92,8 +94,15 @@ public class JobScheduleHelper {
...
@@ -92,8 +94,15 @@ public class JobScheduleHelper {
.
getNextValidTimeAfter
(
new
Date
())
.
getNextValidTimeAfter
(
new
Date
())
.
getTime
()
.
getTime
()
);
);
}
else
{
// 未过期:正常触发,递增计算下次触发时间
ringSecond
=
(
int
)((
jobInfo
.
getTriggerNextTime
()/
1000
)%
60
);
// do trigger
JobTriggerPoolHelper
.
trigger
(
jobInfo
.
getId
(),
TriggerTypeEnum
.
CRON
,
-
1
,
null
,
null
);
logger
.
debug
(
">>>>>>>>>>> xxl-job, push trigger : jobId = "
+
jobInfo
.
getId
()
);
}
else
{
// 未过期:正常触发,递增计算下次触发时间
int
ringSecond
=
(
int
)((
jobInfo
.
getTriggerNextTime
()/
1000
)%
60
);
jobInfo
.
setTriggerLastTime
(
jobInfo
.
getTriggerNextTime
());
jobInfo
.
setTriggerLastTime
(
jobInfo
.
getTriggerNextTime
());
jobInfo
.
setTriggerNextTime
(
jobInfo
.
setTriggerNextTime
(
...
@@ -101,20 +110,18 @@ public class JobScheduleHelper {
...
@@ -101,20 +110,18 @@ public class JobScheduleHelper {
.
getNextValidTimeAfter
(
new
Date
(
jobInfo
.
getTriggerNextTime
()))
.
getNextValidTimeAfter
(
new
Date
(
jobInfo
.
getTriggerNextTime
()))
.
getTime
()
.
getTime
()
);
);
}
if
(
ringSecond
==
-
1
)
{
continue
;
}
// push async ring
// push async ring
List
<
Integer
>
ringItemData
=
ringData
.
get
(
ringSecond
);
List
<
Integer
>
ringItemData
=
ringData
.
get
(
ringSecond
);
if
(
ringItemData
==
null
)
{
if
(
ringItemData
==
null
)
{
ringItemData
=
new
ArrayList
<
Integer
>();
ringItemData
=
new
ArrayList
<
Integer
>();
ringData
.
put
(
ringSecond
,
ringItemData
);
ringData
.
put
(
ringSecond
,
ringItemData
);
}
ringItemData
.
add
(
jobInfo
.
getId
());
logger
.
debug
(
">>>>>>>>>>> xxl-job, push time-ring : "
+
ringSecond
+
" = "
+
Arrays
.
asList
(
ringItemData
)
);
}
}
ringItemData
.
add
(
jobInfo
.
getId
());
logger
.
debug
(
">>>>>>>>>>> xxl-job, push time-ring : "
+
ringSecond
+
" = "
+
Arrays
.
asList
(
ringItemData
)
);
}
}
// 3、更新trigger信息
// 3、更新trigger信息
...
@@ -181,29 +188,18 @@ public class JobScheduleHelper {
...
@@ -181,29 +188,18 @@ public class JobScheduleHelper {
}
}
}
}
int
lastSecond
=
-
1
;
while
(!
ringThreadToStop
)
{
while
(!
ringThreadToStop
)
{
try
{
try
{
// second data
// second data
List
<
Integer
>
ringItemData
=
new
ArrayList
<>();
List
<
Integer
>
ringItemData
=
new
ArrayList
<>();
int
nowSecond
=
(
int
)((
System
.
currentTimeMillis
()/
1000
)%
60
);
// 避免处理耗时太长,跨过刻度;
int
nowSecond
=
Calendar
.
getInstance
().
get
(
Calendar
.
SECOND
);
// 避免处理耗时太长,跨过刻度,向前校验一个刻度;
if
(
lastSecond
==
-
1
)
{
for
(
int
i
=
0
;
i
<
2
;
i
++)
{
lastSecond
=
(
nowSecond
+
59
)%
60
;
List
<
Integer
>
tmpData
=
ringData
.
remove
(
(
nowSecond
+
60
-
i
)%
60
);
}
for
(
int
i
=
1
;
i
<=
60
;
i
++)
{
int
secondItem
=
(
lastSecond
+
i
)%
60
;
List
<
Integer
>
tmpData
=
ringData
.
remove
(
secondItem
);
if
(
tmpData
!=
null
)
{
if
(
tmpData
!=
null
)
{
ringItemData
.
addAll
(
tmpData
);
ringItemData
.
addAll
(
tmpData
);
}
}
if
(
secondItem
==
nowSecond
)
{
break
;
}
}
}
lastSecond
=
nowSecond
;
// ring trigger
// ring trigger
logger
.
debug
(
">>>>>>>>>>> xxl-job, time-ring beat : "
+
nowSecond
+
" = "
+
Arrays
.
asList
(
ringItemData
)
);
logger
.
debug
(
">>>>>>>>>>> xxl-job, time-ring beat : "
+
nowSecond
+
" = "
+
Arrays
.
asList
(
ringItemData
)
);
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论