Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
DolphinScheduler
提交
0dca8d88
DolphinScheduler
项目概览
apache
/
DolphinScheduler
上一次同步 接近 2 年
通知
707
Star
9572
Fork
3514
代码
文件
提交
分支
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,发现更多精彩内容 >>
未验证
提交
0dca8d88
编写于
6月 24, 2020
作者:
X
xingchun-chen
提交者:
GitHub
6月 24, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' into dev-merge
上级
e343ee0e
ad28c651
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
11 addition
and
17 deletion
+11
-17
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ResourcesController.java
.../dolphinscheduler/api/controller/ResourcesController.java
+1
-1
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/consumer/TaskPriorityQueueConsumerTest.java
...server/master/consumer/TaskPriorityQueueConsumerTest.java
+9
-15
sql/dolphinscheduler_mysql.sql
sql/dolphinscheduler_mysql.sql
+1
-1
未找到文件。
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ResourcesController.java
浏览文件 @
0dca8d88
...
@@ -63,7 +63,7 @@ public class ResourcesController extends BaseController {
...
@@ -63,7 +63,7 @@ public class ResourcesController extends BaseController {
private
UdfFuncService
udfFuncService
;
private
UdfFuncService
udfFuncService
;
/**
/**
* create
resource
* create
directory
*
*
* @param loginUser login user
* @param loginUser login user
* @param alias alias
* @param alias alias
...
...
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/consumer/TaskPriorityQueueConsumerTest.java
浏览文件 @
0dca8d88
...
@@ -76,9 +76,9 @@ public class TaskPriorityQueueConsumerTest {
...
@@ -76,9 +76,9 @@ public class TaskPriorityQueueConsumerTest {
tenant
.
setCreateTime
(
new
Date
());
tenant
.
setCreateTime
(
new
Date
());
tenant
.
setUpdateTime
(
new
Date
());
tenant
.
setUpdateTime
(
new
Date
());
Mockito
.
when
(
processService
.
getTenantForProcess
(
1
,
2
)).
thenReturn
(
tenant
);
Mockito
.
doReturn
(
tenant
).
when
(
processService
).
getTenantForProcess
(
1
,
2
);
Mockito
.
when
(
processService
.
queryUserQueueByProcessInstanceId
(
1
)).
thenReturn
(
"default"
);
Mockito
.
doReturn
(
"default"
).
when
(
processService
).
queryUserQueueByProcessInstanceId
(
1
);
}
}
...
@@ -105,7 +105,7 @@ public class TaskPriorityQueueConsumerTest {
...
@@ -105,7 +105,7 @@ public class TaskPriorityQueueConsumerTest {
processDefinition
.
setProjectId
(
1
);
processDefinition
.
setProjectId
(
1
);
taskInstance
.
setProcessDefine
(
processDefinition
);
taskInstance
.
setProcessDefine
(
processDefinition
);
Mockito
.
when
(
processService
.
getTaskInstanceDetailByTaskId
(
1
)).
thenReturn
(
taskInstance
);
Mockito
.
doReturn
(
taskInstance
).
when
(
processService
).
getTaskInstanceDetailByTaskId
(
1
);
taskPriorityQueue
.
put
(
"2_1_2_1_default"
);
taskPriorityQueue
.
put
(
"2_1_2_1_default"
);
Thread
.
sleep
(
10000
);
Thread
.
sleep
(
10000
);
...
@@ -134,8 +134,7 @@ public class TaskPriorityQueueConsumerTest {
...
@@ -134,8 +134,7 @@ public class TaskPriorityQueueConsumerTest {
processDefinition
.
setUserId
(
2
);
processDefinition
.
setUserId
(
2
);
processDefinition
.
setProjectId
(
1
);
processDefinition
.
setProjectId
(
1
);
taskInstance
.
setProcessDefine
(
processDefinition
);
taskInstance
.
setProcessDefine
(
processDefinition
);
Mockito
.
doReturn
(
taskInstance
).
when
(
processService
).
getTaskInstanceDetailByTaskId
(
1
);
Mockito
.
when
(
processService
.
getTaskInstanceDetailByTaskId
(
1
)).
thenReturn
(
taskInstance
);
taskPriorityQueue
.
put
(
"2_1_2_1_default"
);
taskPriorityQueue
.
put
(
"2_1_2_1_default"
);
DataSource
dataSource
=
new
DataSource
();
DataSource
dataSource
=
new
DataSource
();
...
@@ -147,7 +146,7 @@ public class TaskPriorityQueueConsumerTest {
...
@@ -147,7 +146,7 @@ public class TaskPriorityQueueConsumerTest {
dataSource
.
setCreateTime
(
new
Date
());
dataSource
.
setCreateTime
(
new
Date
());
dataSource
.
setUpdateTime
(
new
Date
());
dataSource
.
setUpdateTime
(
new
Date
());
Mockito
.
when
(
processService
.
findDataSourceById
(
1
)).
thenReturn
(
dataSource
);
Mockito
.
doReturn
(
dataSource
).
when
(
processService
).
findDataSourceById
(
1
);
Thread
.
sleep
(
10000
);
Thread
.
sleep
(
10000
);
}
}
...
@@ -175,8 +174,7 @@ public class TaskPriorityQueueConsumerTest {
...
@@ -175,8 +174,7 @@ public class TaskPriorityQueueConsumerTest {
processDefinition
.
setUserId
(
2
);
processDefinition
.
setUserId
(
2
);
processDefinition
.
setProjectId
(
1
);
processDefinition
.
setProjectId
(
1
);
taskInstance
.
setProcessDefine
(
processDefinition
);
taskInstance
.
setProcessDefine
(
processDefinition
);
Mockito
.
doReturn
(
taskInstance
).
when
(
processService
).
getTaskInstanceDetailByTaskId
(
1
);
Mockito
.
when
(
processService
.
getTaskInstanceDetailByTaskId
(
1
)).
thenReturn
(
taskInstance
);
taskPriorityQueue
.
put
(
"2_1_2_1_default"
);
taskPriorityQueue
.
put
(
"2_1_2_1_default"
);
...
@@ -189,9 +187,7 @@ public class TaskPriorityQueueConsumerTest {
...
@@ -189,9 +187,7 @@ public class TaskPriorityQueueConsumerTest {
dataSource
.
setConnectionParams
(
"{\"address\":\"jdbc:mysql://192.168.221.185:3306\",\"database\":\"dolphinscheduler_qiaozhanwei\",\"jdbcUrl\":\"jdbc:mysql://192.168.221.185:3306/dolphinscheduler_qiaozhanwei\",\"user\":\"root\",\"password\":\"root@123\"}"
);
dataSource
.
setConnectionParams
(
"{\"address\":\"jdbc:mysql://192.168.221.185:3306\",\"database\":\"dolphinscheduler_qiaozhanwei\",\"jdbcUrl\":\"jdbc:mysql://192.168.221.185:3306/dolphinscheduler_qiaozhanwei\",\"user\":\"root\",\"password\":\"root@123\"}"
);
dataSource
.
setCreateTime
(
new
Date
());
dataSource
.
setCreateTime
(
new
Date
());
dataSource
.
setUpdateTime
(
new
Date
());
dataSource
.
setUpdateTime
(
new
Date
());
Mockito
.
doReturn
(
dataSource
).
when
(
processService
).
findDataSourceById
(
80
);
Mockito
.
when
(
processService
.
findDataSourceById
(
80
)).
thenReturn
(
dataSource
);
Thread
.
sleep
(
10000
);
Thread
.
sleep
(
10000
);
}
}
...
@@ -218,12 +214,10 @@ public class TaskPriorityQueueConsumerTest {
...
@@ -218,12 +214,10 @@ public class TaskPriorityQueueConsumerTest {
processDefinition
.
setUserId
(
2
);
processDefinition
.
setUserId
(
2
);
processDefinition
.
setProjectId
(
1
);
processDefinition
.
setProjectId
(
1
);
taskInstance
.
setProcessDefine
(
processDefinition
);
taskInstance
.
setProcessDefine
(
processDefinition
);
Mockito
.
doReturn
(
taskInstance
).
when
(
processService
).
getTaskInstanceDetailByTaskId
(
1
);
Mockito
.
when
(
processService
.
getTaskInstanceDetailByTaskId
(
1
)).
thenReturn
(
taskInstance
);
taskPriorityQueue
.
put
(
"2_1_2_1_default"
);
taskPriorityQueue
.
put
(
"2_1_2_1_default"
);
DataSource
dataSource
=
new
DataSource
();
DataSource
dataSource
=
new
DataSource
();
dataSource
.
setId
(
1
);
dataSource
.
setId
(
1
);
dataSource
.
setName
(
"datax"
);
dataSource
.
setName
(
"datax"
);
...
@@ -251,7 +245,7 @@ public class TaskPriorityQueueConsumerTest {
...
@@ -251,7 +245,7 @@ public class TaskPriorityQueueConsumerTest {
taskInstance
.
setExecutorId
(
2
);
taskInstance
.
setExecutorId
(
2
);
Mockito
.
when
(
processService
.
findTaskInstanceById
(
1
)).
thenReturn
(
taskInstance
);
Mockito
.
doReturn
(
taskInstance
).
when
(
processService
).
findTaskInstanceById
(
1
);
taskPriorityQueueConsumer
.
taskInstanceIsFinalState
(
1
);
taskPriorityQueueConsumer
.
taskInstanceIsFinalState
(
1
);
}
}
...
...
sql/dolphinscheduler_mysql.sql
浏览文件 @
0dca8d88
...
@@ -815,4 +815,4 @@ INSERT INTO `t_ds_relation_user_alertgroup` VALUES ('1', '1', '1', '2018-11-29 1
...
@@ -815,4 +815,4 @@ INSERT INTO `t_ds_relation_user_alertgroup` VALUES ('1', '1', '1', '2018-11-29 1
-- ----------------------------
-- ----------------------------
-- Records of t_ds_user
-- Records of t_ds_user
-- ----------------------------
-- ----------------------------
INSERT
INTO
`t_ds_user`
VALUES
(
'1'
,
'admin'
,
'7ad2410b2f4c074479a8937a28a22b8f'
,
'0'
,
'xxx@qq.com'
,
'xx'
,
'0'
,
'2018-03-27 15:48:50'
,
'2018-10-24 17:40:22'
,
null
);
INSERT
INTO
`t_ds_user`
VALUES
(
'1'
,
'admin'
,
'7ad2410b2f4c074479a8937a28a22b8f'
,
'0'
,
'xxx@qq.com'
,
'xx'
,
'0'
,
'2018-03-27 15:48:50'
,
'2018-10-24 17:40:22'
,
null
,
1
);
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录