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
db7fdf19
authored
Jul 25, 2019
by
xuxueli
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
DB重连优化,修复DB宕机重连后任务调度停止的问题,重连后自动加入调度集群触发任务调度;
parent
9f9df30f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
38 additions
and
23 deletions
doc/XXL-JOB官方文档.md
xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java
xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js
doc/XXL-JOB官方文档.md
View file @
db7fdf19
## 《分
布式任务调度平台XXL-JOB》
## 《分
布式任务调度平台XXL-JOB》
...
...
@@ -1516,11 +1516,12 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段
-
5、注册监控线程优化,降低死锁几率;
-
6、调度组件优化:针对永远不会触发的Cron禁止配置和启动;任务Cron最后一次触发后再也不会触发时,比如一次性任务,主动停止相关任务;
-
7、任务列表交互优化,支持查看任务所属执行器的注册节点;
-
8、
[
ING
]
调度日志优化:支持设置日志保留天数,过期日志天维度记录报表,并清理;调度报表汇总实时数据和报表;
-
9、
[
ING
]
父子任务参数传递;
-
10、
[
ING
]
执行器端口复用,复用容器端口提供通讯服务;
-
11、
[
ING
]
执行器服务端口与注册端口分离,支持docker动态随机端口;
-
12、
[
ING
]
Cron在线生成工具;
-
8、DB重连优化,修复DB宕机重连后任务调度停止的问题,重连后自动加入调度集群触发任务调度;
-
9、
[
ING
]
调度日志优化:支持设置日志保留天数,过期日志天维度记录报表,并清理;调度报表汇总实时数据和报表;
-
10、
[
ING
]
父子任务参数传递;
-
11、
[
ING
]
执行器端口复用,复用容器端口提供通讯服务;
-
12、
[
ING
]
执行器服务端口与注册端口分离,支持docker动态随机端口;
-
13、
[
ING
]
Cron在线生成工具;
### TODO LIST
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java
View file @
db7fdf19
...
...
@@ -49,17 +49,20 @@ public class JobScheduleHelper {
}
logger
.
info
(
">>>>>>>>> init xxl-job admin scheduler success."
);
Connection
conn
=
null
;
while
(!
scheduleThreadToStop
)
{
// Scan Job
long
start
=
System
.
currentTimeMillis
();
Connection
conn
=
null
;
Boolean
connAutoCommit
=
null
;
PreparedStatement
preparedStatement
=
null
;
boolean
preReadSuc
=
true
;
try
{
if
(
conn
==
null
||
conn
.
isClosed
())
{
conn
=
XxlJobAdminConfig
.
getAdminConfig
().
getDataSource
().
getConnection
();
}
conn
=
XxlJobAdminConfig
.
getAdminConfig
().
getDataSource
().
getConnection
();
connAutoCommit
=
conn
.
getAutoCommit
();
conn
.
setAutoCommit
(
false
);
preparedStatement
=
conn
.
prepareStatement
(
"select * from xxl_job_lock where lock_name = 'schedule_lock' for update"
);
...
...
@@ -169,11 +172,27 @@ public class JobScheduleHelper {
}
finally
{
// commit
try
{
conn
.
commit
();
}
catch
(
SQLException
e
)
{
if
(!
scheduleThreadToStop
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
if
(
conn
!=
null
)
{
try
{
conn
.
commit
();
}
catch
(
SQLException
e
)
{
if
(!
scheduleThreadToStop
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
}
}
try
{
conn
.
setAutoCommit
(
connAutoCommit
);
}
catch
(
SQLException
e
)
{
if
(!
scheduleThreadToStop
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
}
}
try
{
conn
.
close
();
}
catch
(
SQLException
e
)
{
if
(!
scheduleThreadToStop
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
}
}
}
...
...
@@ -204,12 +223,7 @@ public class JobScheduleHelper {
}
}
if
(
conn
!=
null
)
{
try
{
conn
.
close
();
}
catch
(
SQLException
e
)
{
}
}
logger
.
info
(
">>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread stop"
);
}
});
...
...
xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js
View file @
db7fdf19
...
...
@@ -90,9 +90,9 @@ $(function() {
"render"
:
function
(
data
,
type
,
row
)
{
// status
if
(
1
==
data
)
{
return
'<small class="label label-success" >
<i class="fa fa-clock-o"></i>
RUNNING</small>'
;
return
'<small class="label label-success" >RUNNING</small>'
;
}
else
{
return
'<small class="label label-default" >
<i class="fa fa-clock-o"></i>
STOP</small>'
;
return
'<small class="label label-default" >STOP</small>'
;
}
return
data
;
}
...
...
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