Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
熊鹏飞
/
xxljob220
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
f754b1ce
authored
Jul 06, 2019
by
xuxueli
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
执行器回调线程优化,回调地址为空时销毁问题修复;
parent
33a3e4f6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
35 deletions
doc/XXL-JOB官方文档.md
xxl-job-core/pom.xml
xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java
xxl-job-core/src/test/java/com/xxl/job/core/biz/impl/ExecutorBizImplTest.java
doc/XXL-JOB官方文档.md
View file @
f754b1ce
## 《分
布式任务调度平台XXL-JOB》
## 《分
布式任务调度平台XXL-JOB》
...
...
@@ -1478,6 +1478,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段
-
12、首页调度报表的日期排序在TIDB下乱序问题修复;
-
13、调度中心与执行器双向通讯超时时间调整为3s;
-
14、调度组件销毁流程优化,先停止调度线程,然后等待时间轮内存量任务处理完成,最终销毁时间轮线程;
-
15、执行器回调线程优化,回调地址为空时销毁问题修复;
### 6.26 版本 v2.1.1 Release Notes[规划中]
...
...
xxl-job-core/pom.xml
View file @
f754b1ce
...
...
@@ -44,31 +44,11 @@
<scope>
provided
</scope>
</dependency>
<!-- junit -->
<dependency>
<groupId>
org.powermock
</groupId>
<artifactId>
powermock-api-mockito
</artifactId>
<version>
1.6.5
</version>
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
org.powermock
</groupId>
<artifactId>
powermock-module-junit4
</artifactId>
<version>
1.6.5
</version>
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
org.mockito
</groupId>
<artifactId>
mockito-all
</artifactId>
<version>
1.10.19
</version>
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
com.diffblue
</groupId>
<artifactId>
deeptestutils
</artifactId>
<version>
1.9.0
</version>
<groupId>
junit
</groupId>
<artifactId>
junit
</artifactId>
<version>
${junit.version}
</version>
<scope>
test
</scope>
</dependency>
...
...
xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java
View file @
f754b1ce
...
...
@@ -133,20 +133,25 @@ public class TriggerCallbackThread {
public
void
toStop
(){
toStop
=
true
;
// stop callback, interrupt and wait
triggerCallbackThread
.
interrupt
();
try
{
triggerCallbackThread
.
join
();
}
catch
(
InterruptedException
e
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
if
(
triggerCallbackThread
!=
null
)
{
// support empty admin address
triggerCallbackThread
.
interrupt
();
try
{
triggerCallbackThread
.
join
();
}
catch
(
InterruptedException
e
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
}
}
// stop retry, interrupt and wait
triggerRetryCallbackThread
.
interrupt
();
try
{
triggerRetryCallbackThread
.
join
();
}
catch
(
InterruptedException
e
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
if
(
triggerRetryCallbackThread
!=
null
)
{
triggerRetryCallbackThread
.
interrupt
();
try
{
triggerRetryCallbackThread
.
join
();
}
catch
(
InterruptedException
e
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
}
}
}
/**
...
...
xxl-job-core/src/test/java/com/xxl/job/core/biz/impl/ExecutorBizImplTest.java
View file @
f754b1ce
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment