Browse Source

Merge remote-tracking branch 'remotes/upstream/dev' into dev

pull/2/head
qiaozhanwei 5 years ago
parent
commit
0de01b0280
  1. 2
      README.md
  2. 2
      README_zh_CN.md
  3. 14
      docs/zh_CN/后端部署文档.md
  4. 1
      escheduler-server/src/main/java/cn/escheduler/server/master/runner/MasterExecThread.java
  5. 19
      escheduler-server/src/main/java/cn/escheduler/server/quartz/ProcessScheduleJob.java
  6. 1
      escheduler-server/src/main/java/cn/escheduler/server/worker/runner/FetchTaskThread.java
  7. 2
      escheduler-server/src/main/java/cn/escheduler/server/worker/runner/TaskScheduleThread.java

2
README.md

@ -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:

2
README_zh_CN.md

@ -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工作流任务调度系统。致力于解决数据处理流程中错综复杂的依赖关系,使调度系统在数据处理流程中`开箱即用`。
其主要目标如下: 其主要目标如下:

14
docs/zh_CN/后端部署文档.md

@ -159,8 +159,18 @@ install.sh : 一键部署脚本
* 查看目录 * 查看目录
正常编译完后,会在当前目录生成 target/escheduler-{version}/ , 然后参考 正常编译完后,会在当前目录生成 `target/escheduler-{version}/`
```查看目录
../
├── bin
├── conf
|—— install.sh
|—— lib
|—— logs
|—— script
|—— sql
```
### 2.3 系统常用启停服务(服务用途请具体参见《系统架构设计》小节) ### 2.3 系统常用启停服务(服务用途请具体参见《系统架构设计》小节)

1
escheduler-server/src/main/java/cn/escheduler/server/master/runner/MasterExecThread.java

@ -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;
} }

19
escheduler-server/src/main/java/cn/escheduler/server/quartz/ProcessScheduleJob.java

@ -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 {
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);

1
escheduler-server/src/main/java/cn/escheduler/server/worker/runner/FetchTaskThread.java

@ -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

2
escheduler-server/src/main/java/cn/escheduler/server/worker/runner/TaskScheduleThread.java

@ -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(),

Loading…
Cancel
Save