Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
淡淡忧伤的程序员
DolphinScheduler
提交
55d53144
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,发现更多精彩内容 >>
提交
55d53144
编写于
5月 20, 2019
作者:
L
ligang
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'remotes/upstream/branch-1.0.2' into branch-1.0.2
上级
b5a2e3bb
5956409a
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
49 addition
and
16 deletion
+49
-16
escheduler-api/src/main/java/cn/escheduler/api/controller/ProcessInstanceController.java
.../escheduler/api/controller/ProcessInstanceController.java
+5
-1
escheduler-api/src/main/java/cn/escheduler/api/service/ProcessInstanceService.java
...ava/cn/escheduler/api/service/ProcessInstanceService.java
+30
-9
escheduler-dao/src/main/java/cn/escheduler/dao/ProcessDao.java
...duler-dao/src/main/java/cn/escheduler/dao/ProcessDao.java
+8
-0
escheduler-server/src/main/java/cn/escheduler/server/utils/AlertManager.java
...rc/main/java/cn/escheduler/server/utils/AlertManager.java
+1
-1
escheduler-server/src/main/java/cn/escheduler/server/zk/ZKMasterClient.java
...src/main/java/cn/escheduler/server/zk/ZKMasterClient.java
+2
-2
escheduler-ui/.env
escheduler-ui/.env
+1
-1
escheduler-ui/src/js/conf/home/store/dag/actions.js
escheduler-ui/src/js/conf/home/store/dag/actions.js
+2
-2
未找到文件。
escheduler-api/src/main/java/cn/escheduler/api/controller/ProcessInstanceController.java
浏览文件 @
55d53144
...
...
@@ -22,6 +22,8 @@ import cn.escheduler.api.utils.Constants;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.common.enums.ExecutionStatus
;
import
cn.escheduler.common.enums.Flag
;
import
cn.escheduler.common.queue.ITaskQueue
;
import
cn.escheduler.common.queue.TaskQueueFactory
;
import
cn.escheduler.common.utils.ParameterUtils
;
import
cn.escheduler.dao.model.User
;
import
org.slf4j.Logger
;
...
...
@@ -189,7 +191,9 @@ public class ProcessInstanceController extends BaseController{
try
{
logger
.
info
(
"delete process instance by id, login user:{}, project name:{}, process instance id:{}"
,
loginUser
.
getUserName
(),
projectName
,
processInstanceId
);
Map
<
String
,
Object
>
result
=
processInstanceService
.
deleteProcessInstanceById
(
loginUser
,
projectName
,
processInstanceId
);
// task queue
ITaskQueue
tasksQueue
=
TaskQueueFactory
.
getTaskQueueInstance
();
Map
<
String
,
Object
>
result
=
processInstanceService
.
deleteProcessInstanceById
(
loginUser
,
projectName
,
processInstanceId
,
tasksQueue
);
return
returnDataList
(
result
);
}
catch
(
Exception
e
){
logger
.
error
(
DELETE_PROCESS_INSTANCE_BY_ID_ERROR
.
getMsg
(),
e
);
...
...
escheduler-api/src/main/java/cn/escheduler/api/service/ProcessInstanceService.java
浏览文件 @
55d53144
...
...
@@ -30,6 +30,8 @@ import cn.escheduler.common.graph.DAG;
import
cn.escheduler.common.model.TaskNode
;
import
cn.escheduler.common.model.TaskNodeRelation
;
import
cn.escheduler.common.process.Property
;
import
cn.escheduler.common.queue.ITaskQueue
;
import
cn.escheduler.common.queue.TaskQueueFactory
;
import
cn.escheduler.common.utils.CollectionUtils
;
import
cn.escheduler.common.utils.DateUtils
;
import
cn.escheduler.common.utils.JSONUtils
;
...
...
@@ -446,13 +448,13 @@ public class ProcessInstanceService extends BaseDAGService {
/**
* delete process instance by id, at the same time,delete task instance and their mapping relation data
*
* @param loginUser
* @param projectName
* @param workflowId
* @param processInstanceId
* @param tasksQueue
* @return
*/
public
Map
<
String
,
Object
>
deleteProcessInstanceById
(
User
loginUser
,
String
projectName
,
Integer
workflowId
)
{
public
Map
<
String
,
Object
>
deleteProcessInstanceById
(
User
loginUser
,
String
projectName
,
Integer
processInstanceId
,
ITaskQueue
tasksQueue
)
{
Map
<
String
,
Object
>
result
=
new
HashMap
<>(
5
);
Project
project
=
projectMapper
.
queryByName
(
projectName
);
...
...
@@ -462,17 +464,34 @@ public class ProcessInstanceService extends BaseDAGService {
if
(
resultEnum
!=
Status
.
SUCCESS
)
{
return
checkResult
;
}
ProcessInstance
processInstance
=
processDao
.
findProcessInstanceDetailById
(
workflowId
);
ProcessInstance
processInstance
=
processDao
.
findProcessInstanceDetailById
(
processInstanceId
);
List
<
TaskInstance
>
taskInstanceList
=
processDao
.
findValidTaskListByProcessId
(
processInstanceId
);
//process instance priority
int
processInstancePriority
=
processInstance
.
getProcessInstancePriority
().
ordinal
();
if
(
processInstance
==
null
)
{
putMsg
(
result
,
Status
.
PROCESS_INSTANCE_NOT_EXIST
,
workflow
Id
);
putMsg
(
result
,
Status
.
PROCESS_INSTANCE_NOT_EXIST
,
processInstance
Id
);
return
result
;
}
int
delete
=
processDao
.
deleteWorkProcessInstanceById
(
workflow
Id
);
processDao
.
deleteAllSubWorkProcessByParentId
(
workflow
Id
);
processDao
.
deleteWorkProcessMapByParentId
(
workflow
Id
);
int
delete
=
processDao
.
deleteWorkProcessInstanceById
(
processInstance
Id
);
processDao
.
deleteAllSubWorkProcessByParentId
(
processInstance
Id
);
processDao
.
deleteWorkProcessMapByParentId
(
processInstance
Id
);
if
(
delete
>
0
)
{
if
(
CollectionUtils
.
isNotEmpty
(
taskInstanceList
)){
for
(
TaskInstance
taskInstance
:
taskInstanceList
){
// task instance priority
int
taskInstancePriority
=
taskInstance
.
getTaskInstancePriority
().
ordinal
();
String
nodeValue
=
processInstancePriority
+
"_"
+
processInstanceId
+
"_"
+
taskInstancePriority
+
"_"
+
taskInstance
.
getId
();
try
{
logger
.
info
(
"delete task queue node : {}"
,
nodeValue
);
tasksQueue
.
removeNode
(
cn
.
escheduler
.
common
.
Constants
.
SCHEDULER_TASKS_QUEUE
,
nodeValue
);
}
catch
(
Exception
e
){
logger
.
error
(
"delete task queue node : {}"
,
nodeValue
);
}
}
}
putMsg
(
result
,
Status
.
SUCCESS
);
}
else
{
putMsg
(
result
,
Status
.
DELETE_PROCESS_INSTANCE_BY_ID_ERROR
);
...
...
@@ -489,6 +508,8 @@ public class ProcessInstanceService extends BaseDAGService {
* @return
*/
public
Map
<
String
,
Object
>
batchDeleteProcessInstanceByIds
(
User
loginUser
,
String
projectName
,
String
processInstanceIds
)
{
// task queue
ITaskQueue
tasksQueue
=
TaskQueueFactory
.
getTaskQueueInstance
();
Map
<
String
,
Object
>
result
=
new
HashMap
<>(
5
);
List
<
Integer
>
deleteFailedIdList
=
new
ArrayList
<
Integer
>();
...
...
@@ -507,7 +528,7 @@ public class ProcessInstanceService extends BaseDAGService {
for
(
String
strProcessInstanceId:
processInstanceIdArray
)
{
int
processInstanceId
=
Integer
.
parseInt
(
strProcessInstanceId
);
try
{
deleteProcessInstanceById
(
loginUser
,
projectName
,
processInstanceId
);
deleteProcessInstanceById
(
loginUser
,
projectName
,
processInstanceId
,
tasksQueue
);
}
catch
(
Exception
e
)
{
deleteFailedIdList
.
add
(
processInstanceId
);
}
...
...
escheduler-dao/src/main/java/cn/escheduler/dao/ProcessDao.java
浏览文件 @
55d53144
...
...
@@ -1526,6 +1526,14 @@ public class ProcessDao extends AbstractBaseDao {
}
public
void
selfFaultTolerant
(
int
...
states
){
List
<
ProcessInstance
>
processInstanceList
=
processInstanceMapper
.
listByStatus
(
states
);
for
(
ProcessInstance
processInstance:
processInstanceList
){
selfFaultTolerant
(
processInstance
);
}
}
@Transactional
(
value
=
"TransactionManager"
,
rollbackFor
=
Exception
.
class
)
public
void
selfFaultTolerant
(
ProcessInstance
processInstance
){
...
...
escheduler-server/src/main/java/cn/escheduler/server/utils/AlertManager.java
浏览文件 @
55d53144
...
...
@@ -175,7 +175,7 @@ public class AlertManager {
alert
.
setContent
(
content
);
alert
.
setAlertType
(
AlertType
.
EMAIL
);
alert
.
setCreateTime
(
new
Date
());
alert
.
setAlertGroupId
(
processInstance
.
getWarningGroupId
());
alert
.
setAlertGroupId
(
processInstance
.
getWarningGroupId
()
==
null
?
1
:
processInstance
.
getWarningGroupId
()
);
alert
.
setReceivers
(
processInstance
.
getProcessDefinition
().
getReceivers
());
alert
.
setReceiversCc
(
processInstance
.
getProcessDefinition
().
getReceiversCc
());
...
...
escheduler-server/src/main/java/cn/escheduler/server/zk/ZKMasterClient.java
浏览文件 @
55d53144
...
...
@@ -123,9 +123,9 @@ public class ZKMasterClient extends AbstractZKClient {
// register master
this
.
registMaster
();
// check if fault tolerance is required
// check if fault tolerance is required
,failure and tolerance
if
(
getActiveMasterNum
()
==
1
)
{
processDao
.
selfFaultTolerant
(
ExecutionStatus
.
RUNNING_EXEUTION
.
ordinal
());
processDao
.
selfFaultTolerant
(
ExecutionStatus
.
RUNNING_EXEUTION
.
ordinal
()
,
ExecutionStatus
.
NEED_FAULT_TOLERANCE
.
ordinal
()
);
}
}
...
...
escheduler-ui/.env
浏览文件 @
55d53144
# 后端接口地址
# 后端接口地址
11
API_BASE = http://192.168.xx.xx:12345
# 本地开发如需ip访问项目把"#"号去掉
...
...
escheduler-ui/src/js/conf/home/store/dag/actions.js
浏览文件 @
55d53144
...
...
@@ -538,7 +538,7 @@ export default {
*/
getReceiver
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`projects/
{
projectName}/executors/get-receiver-cc`
,
payload
,
res
=>
{
io
.
get
(
`projects/
${
state
.
projectName
}
/executors/get-receiver-cc`
,
payload
,
res
=>
{
resolve
(
res
.
data
)
}).
catch
(
e
=>
{
reject
(
e
)
...
...
@@ -547,7 +547,7 @@ export default {
},
getTaskListDefIdAll
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`projects/
{
projectName}/process/get-task-list`
,
payload
,
res
=>
{
io
.
get
(
`projects/
${
state
.
projectName
}
/process/get-task-list`
,
payload
,
res
=>
{
resolve
(
res
.
data
)
}).
catch
(
e
=>
{
reject
(
e
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录