Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
pentaLiker
DolphinScheduler
提交
2ec668df
DolphinScheduler
项目概览
pentaLiker
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
1
Star
1
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,发现更多精彩内容 >>
提交
2ec668df
编写于
4月 07, 2020
作者:
Q
qiaozhanwei
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor-worker merge to dev bug fix
上级
223bdec8
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
41 addition
and
6 deletion
+41
-6
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/builder/TaskExecutionContextBuilder.java
...scheduler/server/builder/TaskExecutionContextBuilder.java
+14
-6
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/consumer/TaskPriorityQueueConsumer.java
...ler/server/master/consumer/TaskPriorityQueueConsumer.java
+27
-0
未找到文件。
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/builder/TaskExecutionContextBuilder.java
浏览文件 @
2ec668df
...
...
@@ -18,10 +18,7 @@
package
org.apache.dolphinscheduler.server.builder
;
import
org.apache.dolphinscheduler.dao.entity.*
;
import
org.apache.dolphinscheduler.server.entity.DataxTaskExecutionContext
;
import
org.apache.dolphinscheduler.server.entity.ProcedureTaskExecutionContext
;
import
org.apache.dolphinscheduler.server.entity.SQLTaskExecutionContext
;
import
org.apache.dolphinscheduler.server.entity.TaskExecutionContext
;
import
org.apache.dolphinscheduler.server.entity.*
;
/**
* TaskExecutionContext builder
...
...
@@ -111,14 +108,25 @@ public class TaskExecutionContextBuilder {
/**
* build procedureTask related info
*
* @param procedureTaskExecutionContext
* @return
* @param procedureTaskExecutionContext
procedureTaskExecutionContext
* @return
TaskExecutionContextBuilder
*/
public
TaskExecutionContextBuilder
buildProcedureTaskRelatedInfo
(
ProcedureTaskExecutionContext
procedureTaskExecutionContext
){
taskExecutionContext
.
setProcedureTaskExecutionContext
(
procedureTaskExecutionContext
);
return
this
;
}
/**
* build sqoopTask related info
*
* @param sqoopTaskExecutionContext sqoopTaskExecutionContext
* @return TaskExecutionContextBuilder
*/
public
TaskExecutionContextBuilder
buildSqoopTaskRelatedInfo
(
SqoopTaskExecutionContext
sqoopTaskExecutionContext
){
taskExecutionContext
.
setSqoopTaskExecutionContext
(
sqoopTaskExecutionContext
);
return
this
;
}
/**
* create
...
...
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/consumer/TaskPriorityQueueConsumer.java
浏览文件 @
2ec668df
...
...
@@ -159,6 +159,7 @@ public class TaskPriorityQueueConsumer extends Thread{
SQLTaskExecutionContext
sqlTaskExecutionContext
=
new
SQLTaskExecutionContext
();
DataxTaskExecutionContext
dataxTaskExecutionContext
=
new
DataxTaskExecutionContext
();
ProcedureTaskExecutionContext
procedureTaskExecutionContext
=
new
ProcedureTaskExecutionContext
();
SqoopTaskExecutionContext
sqoopTaskExecutionContext
=
new
SqoopTaskExecutionContext
();
// SQL task
...
...
@@ -178,6 +179,10 @@ public class TaskPriorityQueueConsumer extends Thread{
setProcedureTaskRelation
(
procedureTaskExecutionContext
,
taskNode
);
}
if
(
taskType
==
TaskType
.
SQOOP
){
setSqoopTaskRelation
(
sqoopTaskExecutionContext
,
taskNode
);
}
return
TaskExecutionContextBuilder
.
get
()
.
buildTaskInstanceRelatedInfo
(
taskInstance
)
...
...
@@ -222,6 +227,28 @@ public class TaskPriorityQueueConsumer extends Thread{
dataxTaskExecutionContext
.
setTargetConnectionParams
(
dataTarget
.
getConnectionParams
());
}
/**
* set datax task relation
* @param sqoopTaskExecutionContext sqoopTaskExecutionContext
* @param taskNode taskNode
*/
private
void
setSqoopTaskRelation
(
SqoopTaskExecutionContext
sqoopTaskExecutionContext
,
TaskNode
taskNode
)
{
DataxParameters
dataxParameters
=
JSONObject
.
parseObject
(
taskNode
.
getParams
(),
DataxParameters
.
class
);
DataSource
dataSource
=
processService
.
findDataSourceById
(
dataxParameters
.
getDataSource
());
DataSource
dataTarget
=
processService
.
findDataSourceById
(
dataxParameters
.
getDataTarget
());
sqoopTaskExecutionContext
.
setDataSourceId
(
dataxParameters
.
getDataSource
());
sqoopTaskExecutionContext
.
setSourcetype
(
dataSource
.
getType
().
getCode
());
sqoopTaskExecutionContext
.
setSourceConnectionParams
(
dataSource
.
getConnectionParams
());
sqoopTaskExecutionContext
.
setDataTargetId
(
dataxParameters
.
getDataTarget
());
sqoopTaskExecutionContext
.
setTargetType
(
dataTarget
.
getType
().
getCode
());
sqoopTaskExecutionContext
.
setTargetConnectionParams
(
dataTarget
.
getConnectionParams
());
}
/**
* set SQL task relation
* @param sqlTaskExecutionContext sqlTaskExecutionContext
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录