Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lhongjum2003
DolphinScheduler
提交
0de01b02
DolphinScheduler
项目概览
lhongjum2003
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
2
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,发现更多精彩内容 >>
提交
0de01b02
编写于
7月 25, 2019
作者:
journey2018
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'remotes/upstream/dev' into dev
上级
aedd56ec
be6292d5
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
19 addition
and
22 deletion
+19
-22
README.md
README.md
+1
-1
README_zh_CN.md
README_zh_CN.md
+1
-1
docs/zh_CN/后端部署文档.md
docs/zh_CN/后端部署文档.md
+12
-2
escheduler-server/src/main/java/cn/escheduler/server/master/runner/MasterExecThread.java
.../cn/escheduler/server/master/runner/MasterExecThread.java
+1
-0
escheduler-server/src/main/java/cn/escheduler/server/quartz/ProcessScheduleJob.java
.../java/cn/escheduler/server/quartz/ProcessScheduleJob.java
+3
-16
escheduler-server/src/main/java/cn/escheduler/server/worker/runner/FetchTaskThread.java
...a/cn/escheduler/server/worker/runner/FetchTaskThread.java
+0
-1
escheduler-server/src/main/java/cn/escheduler/server/worker/runner/TaskScheduleThread.java
...n/escheduler/server/worker/runner/TaskScheduleThread.java
+1
-1
未找到文件。
README.md
浏览文件 @
0de01b02
...
@@ -4,7 +4,7 @@ Easy Scheduler
...
@@ -4,7 +4,7 @@ Easy Scheduler
> Easy Scheduler for Big Data
> Easy Scheduler for Big Data
[
English
](
https://github.com/analysys/EasyScheduler/blob/dev/README.md
)
|
[
Chinese
](
https://github.com/analysys/EasyScheduler/blob/dev/
README_zh_CN.md
)
[
English
](
README.md
)
|
[
Chinese
](
README_zh_CN.md
)
### Design features:
### Design features:
...
...
README_zh_CN.md
浏览文件 @
0de01b02
...
@@ -4,7 +4,7 @@ Easy Scheduler
...
@@ -4,7 +4,7 @@ Easy Scheduler
> Easy Scheduler for Big Data
> Easy Scheduler for Big Data
[
中文
](
https://github.com/analysys/EasyScheduler/blob/dev/README_zh_CN.md
)
|
[
英文
](
https://github.com/analysys/EasyScheduler/blob/dev/
README.md
)
[
中文
](
README_zh_CN.md
)
|
[
英文
](
README.md
)
**设计特点:**
一个分布式易扩展的可视化DAG工作流任务调度系统。致力于解决数据处理流程中错综复杂的依赖关系,使调度系统在数据处理流程中
`开箱即用`
。
**设计特点:**
一个分布式易扩展的可视化DAG工作流任务调度系统。致力于解决数据处理流程中错综复杂的依赖关系,使调度系统在数据处理流程中
`开箱即用`
。
其主要目标如下:
其主要目标如下:
...
...
docs/zh_CN/后端部署文档.md
浏览文件 @
0de01b02
...
@@ -159,8 +159,18 @@ install.sh : 一键部署脚本
...
@@ -159,8 +159,18 @@ install.sh : 一键部署脚本
*
查看目录
*
查看目录
正常编译完后,会在当前目录生成 target/escheduler-{version}/ , 然后参考
正常编译完后,会在当前目录生成
`target/escheduler-{version}/`
```
查看目录
../
├── bin
├── conf
|—— install.sh
|—— lib
|—— logs
|—— script
|—— sql
```
### 2.3 系统常用启停服务(服务用途请具体参见《系统架构设计》小节)
### 2.3 系统常用启停服务(服务用途请具体参见《系统架构设计》小节)
...
...
escheduler-server/src/main/java/cn/escheduler/server/master/runner/MasterExecThread.java
浏览文件 @
0de01b02
...
@@ -277,6 +277,7 @@ public class MasterExecThread implements Runnable {
...
@@ -277,6 +277,7 @@ public class MasterExecThread implements Runnable {
ProcessDag
processDag
=
generateFlowDag
(
processInstance
.
getProcessInstanceJson
(),
ProcessDag
processDag
=
generateFlowDag
(
processInstance
.
getProcessInstanceJson
(),
startNodeNameList
,
recoveryNameList
,
processInstance
.
getTaskDependType
());
startNodeNameList
,
recoveryNameList
,
processInstance
.
getTaskDependType
());
if
(
processDag
==
null
){
if
(
processDag
==
null
){
//TODO...
logger
.
error
(
"processDag is null"
);
logger
.
error
(
"processDag is null"
);
return
;
return
;
}
}
...
...
escheduler-server/src/main/java/cn/escheduler/server/quartz/ProcessScheduleJob.java
浏览文件 @
0de01b02
...
@@ -78,6 +78,7 @@ public class ProcessScheduleJob implements Job {
...
@@ -78,6 +78,7 @@ public class ProcessScheduleJob implements Job {
@Override
@Override
public
void
execute
(
JobExecutionContext
context
)
throws
JobExecutionException
{
public
void
execute
(
JobExecutionContext
context
)
throws
JobExecutionException
{
//TODO...
Assert
.
notNull
(
processDao
,
"please call init() method first"
);
Assert
.
notNull
(
processDao
,
"please call init() method first"
);
JobDataMap
dataMap
=
context
.
getJobDetail
().
getJobDataMap
();
JobDataMap
dataMap
=
context
.
getJobDetail
().
getJobDataMap
();
...
@@ -85,24 +86,10 @@ public class ProcessScheduleJob implements Job {
...
@@ -85,24 +86,10 @@ public class ProcessScheduleJob implements Job {
int
projectId
=
dataMap
.
getInt
(
Constants
.
PROJECT_ID
);
int
projectId
=
dataMap
.
getInt
(
Constants
.
PROJECT_ID
);
int
scheduleId
=
dataMap
.
getInt
(
Constants
.
SCHEDULE_ID
);
int
scheduleId
=
dataMap
.
getInt
(
Constants
.
SCHEDULE_ID
);
/**
* The scheduled time the trigger fired for. For instance the scheduled
* time may have been 10:00:00 but the actual fire time may have been
* 10:00:03 if the scheduler was too busy.
*
* @return Returns the scheduledFireTime.
* @see #getFireTime()
*/
Date
scheduledFireTime
=
context
.
getScheduledFireTime
();
Date
scheduledFireTime
=
context
.
getScheduledFireTime
();
/**
* The actual time the trigger fired. For instance the scheduled time may
* have been 10:00:00 but the actual fire time may have been 10:00:03 if
* the scheduler was too busy.
*
* @return Returns the fireTime.
* @see #getScheduledFireTime()
*/
Date
fireTime
=
context
.
getFireTime
();
Date
fireTime
=
context
.
getFireTime
();
logger
.
info
(
"scheduled fire time :{}, fire time :{}, process id :{}"
,
scheduledFireTime
,
fireTime
,
scheduleId
);
logger
.
info
(
"scheduled fire time :{}, fire time :{}, process id :{}"
,
scheduledFireTime
,
fireTime
,
scheduleId
);
...
...
escheduler-server/src/main/java/cn/escheduler/server/worker/runner/FetchTaskThread.java
浏览文件 @
0de01b02
...
@@ -128,7 +128,6 @@ public class FetchTaskThread implements Runnable{
...
@@ -128,7 +128,6 @@ public class FetchTaskThread implements Runnable{
while
(
Stopper
.
isRunning
()){
while
(
Stopper
.
isRunning
()){
InterProcessMutex
mutex
=
null
;
InterProcessMutex
mutex
=
null
;
try
{
try
{
ThreadPoolExecutor
poolExecutor
=
(
ThreadPoolExecutor
)
workerExecService
;
ThreadPoolExecutor
poolExecutor
=
(
ThreadPoolExecutor
)
workerExecService
;
//check memory and cpu usage and threads
//check memory and cpu usage and threads
...
...
escheduler-server/src/main/java/cn/escheduler/server/worker/runner/TaskScheduleThread.java
浏览文件 @
0de01b02
...
@@ -252,7 +252,7 @@ public class TaskScheduleThread implements Callable<Boolean> {
...
@@ -252,7 +252,7 @@ public class TaskScheduleThread implements Callable<Boolean> {
}
}
}
}
}
catch
(
Exception
e
){
}
catch
(
Exception
e
){
logger
.
error
(
"task escheduler failure : "
+
e
.
getMessage
(),
e
);
logger
.
error
(
"task escheduler failure : "
,
e
);
status
=
ExecutionStatus
.
FAILURE
;
status
=
ExecutionStatus
.
FAILURE
;
logger
.
error
(
String
.
format
(
"task process exception, process id : %s , task : %s"
,
logger
.
error
(
String
.
format
(
"task process exception, process id : %s , task : %s"
,
taskInstance
.
getProcessInstanceId
(),
taskInstance
.
getProcessInstanceId
(),
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录