Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
淡淡忧伤的程序员
DolphinScheduler
提交
30dbbad6
DolphinScheduler
项目概览
淡淡忧伤的程序员
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
48
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
DolphinScheduler
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
30dbbad6
编写于
7月 02, 2019
作者:
journey2018
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'remotes/upstream/dev-1.1.0' into dev-1.1.0
上级
a4ca7501
660b325f
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
94 addition
and
80 deletion
+94
-80
escheduler-dao/src/main/java/cn/escheduler/dao/ProcessDao.java
...duler-dao/src/main/java/cn/escheduler/dao/ProcessDao.java
+12
-6
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessInstanceMapperProvider.java
.../escheduler/dao/mapper/ProcessInstanceMapperProvider.java
+3
-3
escheduler-server/src/main/java/cn/escheduler/server/worker/runner/FetchTaskThread.java
...a/cn/escheduler/server/worker/runner/FetchTaskThread.java
+0
-6
escheduler-server/src/main/java/cn/escheduler/server/worker/runner/TaskScheduleThread.java
...n/escheduler/server/worker/runner/TaskScheduleThread.java
+79
-65
未找到文件。
escheduler-dao/src/main/java/cn/escheduler/dao/ProcessDao.java
浏览文件 @
30dbbad6
...
...
@@ -642,6 +642,9 @@ public class ProcessDao extends AbstractBaseDao {
// find pause tasks and init task's state
cmdParam
.
remove
(
Constants
.
CMDPARAM_RECOVERY_START_NODE_STRING
);
List
<
Integer
>
suspendedNodeList
=
this
.
findTaskIdByInstanceState
(
processInstance
.
getId
(),
ExecutionStatus
.
PAUSE
);
List
<
Integer
>
stopNodeList
=
findTaskIdByInstanceState
(
processInstance
.
getId
(),
ExecutionStatus
.
KILL
);
suspendedNodeList
.
addAll
(
stopNodeList
);
for
(
Integer
taskId
:
suspendedNodeList
){
// 把暂停状态初始化
initTaskInstance
(
this
.
findTaskInstanceById
(
taskId
));
...
...
@@ -789,13 +792,16 @@ public class ProcessDao extends AbstractBaseDao {
* @param taskInstance
*/
private
void
initTaskInstance
(
TaskInstance
taskInstance
){
if
(
taskInstance
.
getState
().
typeIsFailure
()
&&
!
taskInstance
.
isSubProcess
()){
taskInstance
.
setFlag
(
Flag
.
NO
);
updateTaskInstance
(
taskInstance
);
}
else
{
taskInstance
.
setState
(
ExecutionStatus
.
SUBMITTED_SUCCESS
);
updateTaskInstance
(
taskInstance
);
if
(!
taskInstance
.
isSubProcess
()){
if
(
taskInstance
.
getState
().
typeIsCancel
()
||
taskInstance
.
getState
().
typeIsFailure
()){
taskInstance
.
setFlag
(
Flag
.
NO
);
updateTaskInstance
(
taskInstance
);
return
;
}
}
taskInstance
.
setState
(
ExecutionStatus
.
SUBMITTED_SUCCESS
);
updateTaskInstance
(
taskInstance
);
}
/**
...
...
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessInstanceMapperProvider.java
浏览文件 @
30dbbad6
...
...
@@ -222,11 +222,11 @@ public class ProcessInstanceMapperProvider {
public
String
queryDetailById
(
Map
<
String
,
Object
>
parameter
)
{
return
new
SQL
()
{
{
SELECT
(
"inst.*,
q.queue_name as queue,
UNIX_TIMESTAMP(inst.end_time)-UNIX_TIMESTAMP(inst.start_time) as duration"
);
SELECT
(
"inst.*,UNIX_TIMESTAMP(inst.end_time)-UNIX_TIMESTAMP(inst.start_time) as duration"
);
FROM
(
TABLE_NAME
+
" inst
, t_escheduler_user u,t_escheduler_queue q
"
);
FROM
(
TABLE_NAME
+
" inst"
);
WHERE
(
"inst.
executor_id = u.id AND t.queue_id = q.id AND inst.
id = #{processId}"
);
WHERE
(
"inst.id = #{processId}"
);
}
}.
toString
();
}
...
...
escheduler-server/src/main/java/cn/escheduler/server/worker/runner/FetchTaskThread.java
浏览文件 @
30dbbad6
...
...
@@ -195,12 +195,6 @@ public class FetchTaskThread implements Runnable{
// get process define
ProcessDefinition
processDefine
=
processDao
.
findProcessDefineById
(
taskInstance
.
getProcessDefinitionId
());
Tenant
tenant
=
processDao
.
getTenantForProcess
(
processInstance
.
getTenantId
(),
processDefine
.
getUserId
());
if
(
tenant
!=
null
){
processInstance
.
setTenantCode
(
tenant
.
getTenantCode
());
}
taskInstance
.
setProcessInstance
(
processInstance
);
taskInstance
.
setProcessDefine
(
processDefine
);
...
...
escheduler-server/src/main/java/cn/escheduler/server/worker/runner/TaskScheduleThread.java
浏览文件 @
30dbbad6
...
...
@@ -34,8 +34,10 @@ import cn.escheduler.common.task.sql.SqlParameters;
import
cn.escheduler.common.utils.*
;
import
cn.escheduler.dao.ProcessDao
;
import
cn.escheduler.dao.TaskRecordDao
;
import
cn.escheduler.dao.model.ProcessDefinition
;
import
cn.escheduler.dao.model.ProcessInstance
;
import
cn.escheduler.dao.model.TaskInstance
;
import
cn.escheduler.dao.model.Tenant
;
import
cn.escheduler.server.utils.LoggerUtils
;
import
cn.escheduler.server.utils.ParamUtils
;
import
cn.escheduler.server.worker.log.TaskLogger
;
...
...
@@ -160,82 +162,94 @@ public class TaskScheduleThread implements Callable<Boolean> {
// set task params
taskProps
.
setTaskParams
(
taskNode
.
getParams
());
// set tenant code , execute task linux user
taskProps
.
setTenantCode
(
taskInstance
.
getProcessInstance
().
getTenantCode
());
ProcessInstance
processInstance
=
processDao
.
findProcessInstanceByTaskId
(
taskInstance
.
getId
());
String
queue
=
processDao
.
queryQueueByProcessInstanceId
(
processInstance
.
getId
());
taskProps
.
setScheduleTime
(
processInstance
.
getScheduleTime
());
taskProps
.
setNodeName
(
taskInstance
.
getName
());
taskProps
.
setTaskInstId
(
taskInstance
.
getId
());
taskProps
.
setEnvFile
(
CommonUtils
.
getSystemEnvPath
());
// set queue
if
(
StringUtils
.
isEmpty
(
queue
)){
taskProps
.
setQueue
(
taskInstance
.
getProcessInstance
().
getQueue
());
}
else
{
taskProps
.
setQueue
(
queue
);
}
taskProps
.
setTaskStartTime
(
taskInstance
.
getStartTime
());
taskProps
.
setDefinedParams
(
allParamMap
);
// set task timeout
setTaskTimeout
(
taskProps
,
taskNode
);
taskProps
.
setDependence
(
taskInstance
.
getDependency
());
taskProps
.
setTaskAppId
(
String
.
format
(
"%s_%s_%s"
,
taskInstance
.
getProcessDefine
().
getId
(),
taskInstance
.
getProcessInstance
().
getId
(),
taskInstance
.
getId
()));
// custom logger
TaskLogger
taskLogger
=
new
TaskLogger
(
LoggerUtils
.
buildTaskId
(
TASK_PREFIX
,
taskInstance
.
getProcessDefine
().
getId
(),
taskInstance
.
getProcessInstance
().
getId
(),
taskInstance
.
getId
()));
task
=
TaskManager
.
newTask
(
taskInstance
.
getTaskType
(),
taskProps
,
taskLogger
);
// job init
task
.
init
();
// job handle
task
.
handle
();
logger
.
info
(
"task : {} exit status code : {}"
,
taskProps
.
getTaskAppId
(),
task
.
getExitStatusCode
());
if
(
task
.
getExitStatusCode
()
==
Constants
.
EXIT_CODE_SUCCESS
){
status
=
ExecutionStatus
.
SUCCESS
;
// task recor flat : if true , start up qianfan
if
(
TaskRecordDao
.
getTaskRecordFlag
()
&&
TaskType
.
typeIsNormalTask
(
taskInstance
.
getTaskType
())){
AbstractParameters
params
=
(
AbstractParameters
)
JSONUtils
.
parseObject
(
taskProps
.
getTaskParams
(),
getCurTaskParamsClass
());
// replace placeholder
Map
<
String
,
Property
>
paramsMap
=
ParamUtils
.
convert
(
taskProps
.
getUserDefParamsMap
(),
taskProps
.
getDefinedParams
(),
params
.
getLocalParametersMap
(),
processInstance
.
getCmdTypeIfComplement
(),
processInstance
.
getScheduleTime
());
if
(
paramsMap
!=
null
&&
!
paramsMap
.
isEmpty
()
&&
paramsMap
.
containsKey
(
"v_proc_date"
)){
String
vProcDate
=
paramsMap
.
get
(
"v_proc_date"
).
getValue
();
if
(!
StringUtils
.
isEmpty
(
vProcDate
)){
TaskRecordStatus
taskRecordState
=
TaskRecordDao
.
getTaskRecordState
(
taskInstance
.
getName
(),
vProcDate
);
logger
.
info
(
"task record status : {}"
,
taskRecordState
);
if
(
taskRecordState
==
TaskRecordStatus
.
FAILURE
){
status
=
ExecutionStatus
.
FAILURE
;
ProcessDefinition
processDefine
=
processDao
.
findProcessDefineById
(
processInstance
.
getProcessDefinitionId
());
Tenant
tenant
=
processDao
.
getTenantForProcess
(
processInstance
.
getTenantId
(),
processDefine
.
getUserId
());
if
(
tenant
==
null
){
processInstance
.
setTenantCode
(
tenant
.
getTenantCode
());
logger
.
error
(
"cannot find the tenant, process definition id:{}, tenant id:{}, user id:{}"
,
processDefine
.
getId
(),
processDefine
.
getTenantId
(),
processDefine
.
getUserId
()
);
status
=
ExecutionStatus
.
FAILURE
;
}
else
{
taskProps
.
setTenantCode
(
tenant
.
getTenantCode
());
String
queue
=
processDao
.
queryQueueByProcessInstanceId
(
processInstance
.
getId
());
// set queue
if
(
StringUtils
.
isEmpty
(
queue
)){
taskProps
.
setQueue
(
taskInstance
.
getProcessInstance
().
getQueue
());
}
else
{
taskProps
.
setQueue
(
tenant
.
getQueueName
());
}
taskProps
.
setTaskStartTime
(
taskInstance
.
getStartTime
());
taskProps
.
setDefinedParams
(
allParamMap
);
// set task timeout
setTaskTimeout
(
taskProps
,
taskNode
);
taskProps
.
setDependence
(
taskInstance
.
getDependency
());
taskProps
.
setTaskAppId
(
String
.
format
(
"%s_%s_%s"
,
taskInstance
.
getProcessDefine
().
getId
(),
taskInstance
.
getProcessInstance
().
getId
(),
taskInstance
.
getId
()));
// custom logger
TaskLogger
taskLogger
=
new
TaskLogger
(
LoggerUtils
.
buildTaskId
(
TASK_PREFIX
,
taskInstance
.
getProcessDefine
().
getId
(),
taskInstance
.
getProcessInstance
().
getId
(),
taskInstance
.
getId
()));
task
=
TaskManager
.
newTask
(
taskInstance
.
getTaskType
(),
taskProps
,
taskLogger
);
// job init
task
.
init
();
// job handle
task
.
handle
();
logger
.
info
(
"task : {} exit status code : {}"
,
taskProps
.
getTaskAppId
(),
task
.
getExitStatusCode
());
if
(
task
.
getExitStatusCode
()
==
Constants
.
EXIT_CODE_SUCCESS
){
status
=
ExecutionStatus
.
SUCCESS
;
// task recor flat : if true , start up qianfan
if
(
TaskRecordDao
.
getTaskRecordFlag
()
&&
TaskType
.
typeIsNormalTask
(
taskInstance
.
getTaskType
())){
AbstractParameters
params
=
(
AbstractParameters
)
JSONUtils
.
parseObject
(
taskProps
.
getTaskParams
(),
getCurTaskParamsClass
());
// replace placeholder
Map
<
String
,
Property
>
paramsMap
=
ParamUtils
.
convert
(
taskProps
.
getUserDefParamsMap
(),
taskProps
.
getDefinedParams
(),
params
.
getLocalParametersMap
(),
processInstance
.
getCmdTypeIfComplement
(),
processInstance
.
getScheduleTime
());
if
(
paramsMap
!=
null
&&
!
paramsMap
.
isEmpty
()
&&
paramsMap
.
containsKey
(
"v_proc_date"
)){
String
vProcDate
=
paramsMap
.
get
(
"v_proc_date"
).
getValue
();
if
(!
StringUtils
.
isEmpty
(
vProcDate
)){
TaskRecordStatus
taskRecordState
=
TaskRecordDao
.
getTaskRecordState
(
taskInstance
.
getName
(),
vProcDate
);
logger
.
info
(
"task record status : {}"
,
taskRecordState
);
if
(
taskRecordState
==
TaskRecordStatus
.
FAILURE
){
status
=
ExecutionStatus
.
FAILURE
;
}
}
}
}
}
}
else
if
(
task
.
getExitStatusCode
()
==
Constants
.
EXIT_CODE_KILL
){
status
=
ExecutionStatus
.
KILL
;
}
else
{
status
=
ExecutionStatus
.
FAILURE
;
}
else
if
(
task
.
getExitStatusCode
()
==
Constants
.
EXIT_CODE_KILL
){
status
=
ExecutionStatus
.
KILL
;
}
else
{
status
=
ExecutionStatus
.
FAILURE
;
}
}
}
catch
(
Exception
e
){
logger
.
error
(
"task escheduler failure : "
+
e
.
getMessage
(),
e
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录