From f2b081b4ab9edc5a2a028e26064994a18cdc8bce Mon Sep 17 00:00:00 2001 From: lenboo Date: Wed, 26 Jun 2019 10:46:33 +0800 Subject: [PATCH 01/15] update 1.0.4 documents --- docs/zh_CN/1.0.3-release.md | 45 +++++++++---------------------------- docs/zh_CN/1.0.4-release.md | 28 +++++++++++++++++++++++ docs/zh_CN/SUMMARY.md | 1 + 3 files changed, 40 insertions(+), 34 deletions(-) create mode 100644 docs/zh_CN/1.0.4-release.md diff --git a/docs/zh_CN/1.0.3-release.md b/docs/zh_CN/1.0.3-release.md index 0b6013bd61..d89e05dd90 100644 --- a/docs/zh_CN/1.0.3-release.md +++ b/docs/zh_CN/1.0.3-release.md @@ -2,45 +2,22 @@ Easy Scheduler Release 1.0.3 === Easy Scheduler 1.0.3是1.x系列中的第四个版本。 -新特性： -=== -- [[EasyScheduler-254](https://github.com/analysys/EasyScheduler/issues/254)] 流程定义删除和批量删除 -- [[EasyScheduler-347](https://github.com/analysys/EasyScheduler/issues/347)] 任务依赖增加“今日” -- [[EasyScheduler-273](https://github.com/analysys/EasyScheduler/issues/273)]sql任务添加title -- [[EasyScheduler-247](https://github.com/analysys/EasyScheduler/issues/247)]API在线文档 -- [[EasyScheduler-319](https://github.com/analysys/EasyScheduler/issues/319)] 单机容错 -- [[EasyScheduler-253](https://github.com/analysys/EasyScheduler/issues/253)] 项目增加流程定义统计和运行流程实例统计 -- [[EasyScheduler-292](https://github.com/analysys/EasyScheduler/issues/292)] 启用SSL的邮箱发送邮件 -- [[EasyScheduler-77](https://github.com/analysys/EasyScheduler/issues/77)] 定时管理、工作流定义添加删除功能 -- [[EasyScheduler-380](https://github.com/analysys/EasyScheduler/issues/380)] 服务监控功能 -- [[EasyScheduler-380](https://github.com/analysys/EasyScheduler/issues/382)] 项目增加流程定义统计和运行流程实例统计 - 增强： === -- [[EasyScheduler-192](https://github.com/analysys/EasyScheduler/issues/192)] 租户删除前可以考虑校验租户和资源 -- [[EasyScheduler-376](https://github.com/analysys/EasyScheduler/issues/294)] 删除实例时候，没有删除对应zookeeper队列里的任务 -- [[EasyScheduler-185](https://github.com/analysys/EasyScheduler/issues/185)] 项目删除工作流定义还存在 -- [[EasyScheduler-206](https://github.com/analysys/EasyScheduler/issues/206)] 优化部署，完善docker化支持 -- [[EasyScheduler-381](https://github.com/analysys/EasyScheduler/issues/381)] 前端一键部署脚本支持ubuntu +- [[EasyScheduler-482]](https://github.com/analysys/EasyScheduler/issues/482)sql任务中的邮件标题增加了对自定义变量的支持 +- [[EasyScheduler-483]](https://github.com/analysys/EasyScheduler/issues/483)sql任务中的发邮件失败,则此sql任务为失败 +- [[EasyScheduler-484]](https://github.com/analysys/EasyScheduler/issues/484)修改sql任务中自定义变量的替换规则,支持多个单引号和双引号的替换 +- [[EasyScheduler-485]](https://github.com/analysys/EasyScheduler/issues/485)创建资源文件时，增加对该资源文件是否在hdfs上已存在的验证 修复： === -- [[EasyScheduler-255](https://github.com/analysys/EasyScheduler/issues/255)]子父流程全局变量覆盖，子流程继承父流程全局变量并可以重写 -- [[EasyScheduler-256](https://github.com/analysys/EasyScheduler/issues/256)]子父流程参数显示异常 -- [[EasyScheduler-186](https://github.com/analysys/EasyScheduler/issues/186)]所有查询中只要输入%会返回所有数据 -- [[EasyScheduler-185](https://github.com/analysys/EasyScheduler/issues/185)]项目删除工作流定义还存在 -- [[EasyScheduler-266](https://github.com/analysys/EasyScheduler/issues/266)]Stop process return: process definition 1 not on line -- [[EasyScheduler-300](https://github.com/analysys/EasyScheduler/issues/300)] 超时告警时间单位 -- [[EasyScheduler-235](https://github.com/analysys/EasyScheduler/issues/235)]nginx超时连接问题修复 -- [[EasyScheduler-272](https://github.com/analysys/EasyScheduler/issues/272)]管理员不能生成token -- [[EasyScheduler-272](https://github.com/analysys/EasyScheduler/issues/277)]save global parameters error -- [[EasyScheduler-183](https://github.com/analysys/EasyScheduler/issues/183)]创建中文名称的Worker分组报错 -- [[EasyScheduler-377](https://github.com/analysys/EasyScheduler/issues/377)]资源文件重命名只修改描述时会报名称已存在错误 -- [[EasyScheduler-235](https://github.com/analysys/EasyScheduler/issues/235)]创建spark数据源，点击“测试连接”，系统回退回到登入页面 -- [[EasyScheduler-83](https://github.com/analysys/EasyScheduler/issues/83)]1.0.1版本启动api server报错 -- [[EasyScheduler-379](https://github.com/analysys/EasyScheduler/issues/379)]跨天恢复执行定时任务时，时间参数不对 -- [[EasyScheduler-383](https://github.com/analysys/EasyScheduler/issues/383)]sql邮件不显示前面的空行 - +- [[EasyScheduler-198]](https://github.com/analysys/EasyScheduler/issues/198) 流程定义列表根据定时状态和更新时间进行排序 +- [[EasyScheduler-419]](https://github.com/analysys/EasyScheduler/issues/419) 修复在线创建文件，hdfs文件未创建，却返回成功 +- [[EasyScheduler-481]](https://github.com/analysys/EasyScheduler/issues/481)修复job不存在定时无法下线的问题 +- [[EasyScheduler-425]](https://github.com/analysys/EasyScheduler/issues/425) kill任务时增加对其子进程的kill +- [[EasyScheduler-422]](https://github.com/analysys/EasyScheduler/issues/422) 修复更新资源文件时更新时间和大小未更新的问题 +- [[EasyScheduler-431]](https://github.com/analysys/EasyScheduler/issues/431) 修复删除租户时,如果未启动hdfs,则删除租户失败的问题 +- [[EasyScheduler-485]](https://github.com/analysys/EasyScheduler/issues/486) shell进程退出，yarn状态非终态等待判断 感谢： === diff --git a/docs/zh_CN/1.0.4-release.md b/docs/zh_CN/1.0.4-release.md new file mode 100644 index 0000000000..5df1027e08 --- /dev/null +++ b/docs/zh_CN/1.0.4-release.md @@ -0,0 +1,28 @@ +Easy Scheduler Release 1.0.4 +=== +Easy Scheduler 1.0.4是1.x系列中的第五个版本。 + +**修复**： +- [[EasyScheduler-198]](https://github.com/analysys/EasyScheduler/issues/198) 流程定义列表根据定时状态和更新时间进行排序 +- [[EasyScheduler-419]](https://github.com/analysys/EasyScheduler/issues/419) 修复在线创建文件，hdfs文件未创建，却返回成功 +- [[EasyScheduler-481]](https://github.com/analysys/EasyScheduler/issues/481)修复job不存在定时无法下线的问题 +- [[EasyScheduler-425]](https://github.com/analysys/EasyScheduler/issues/425) kill任务时增加对其子进程的kill +- [[EasyScheduler-422]](https://github.com/analysys/EasyScheduler/issues/422) 修复更新资源文件时更新时间和大小未更新的问题 +- [[EasyScheduler-431]](https://github.com/analysys/EasyScheduler/issues/431) 修复删除租户时,如果未启动hdfs,则删除租户失败的问题 +- [[EasyScheduler-485]](https://github.com/analysys/EasyScheduler/issues/486) shell进程退出，yarn状态非终态等待判断 + +**增强**: +- [[EasyScheduler-482]](https://github.com/analysys/EasyScheduler/issues/482)sql任务中的邮件标题增加了对自定义变量的支持 +- [[EasyScheduler-483]](https://github.com/analysys/EasyScheduler/issues/483)sql任务中的发邮件失败,则此sql任务为失败 +- [[EasyScheduler-484]](https://github.com/analysys/EasyScheduler/issues/484)修改sql任务中自定义变量的替换规则,支持多个单引号和双引号的替换 +- [[EasyScheduler-485]](https://github.com/analysys/EasyScheduler/issues/485)创建资源文件时，增加对该资源文件是否在hdfs上已存在的验证 + + +感谢： +=== +最后但最重要的是，没有以下伙伴的贡献就没有新版本的诞生(排名不分先后)： + +Baoqi, jimmy201602, samz406, petersear, millionfor, hyperknob, fanguanqun, yangqinlong, qq389401879, +feloxx, coding-now, hymzcn, nysyxxg, chgxtony, lfyee, Crossoverrr, gj-zhang, sunnyingit, xianhu, zhengqiangtan + +以及微信群/钉钉群里众多的热心伙伴！在此非常感谢！ \ No newline at end of file diff --git a/docs/zh_CN/SUMMARY.md b/docs/zh_CN/SUMMARY.md index 0646577560..208907f513 100644 --- a/docs/zh_CN/SUMMARY.md +++ b/docs/zh_CN/SUMMARY.md @@ -35,6 +35,7 @@ * 系统版本升级文档 * [版本升级](升级文档.md) * 历次版本发布内容 + * [1.0.4 release](1.0.4-release.md) * [1.0.3 release](1.0.3-release.md) * [1.0.2 release](1.0.2-release.md) * [1.0.1 release](1.0.1-release.md) From 32f9d17983c6b667788b480687b9758d3398380f Mon Sep 17 00:00:00 2001 From: lenboo Date: Wed, 17 Jul 2019 15:35:16 +0800 Subject: [PATCH 02/15] update receiver and cc for child process --- .../src/main/java/cn/escheduler/dao/ProcessDao.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/ProcessDao.java b/escheduler-dao/src/main/java/cn/escheduler/dao/ProcessDao.java index 09e2149d88..2bda59e5b3 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/ProcessDao.java +++ b/escheduler-dao/src/main/java/cn/escheduler/dao/ProcessDao.java @@ -890,6 +890,9 @@ public class ProcessDao extends AbstractBaseDao { cmdParam.put(CMDPARAM_COMPLEMENT_DATA_START_DATE, startTime); processMapStr = JSONUtils.toJson(cmdParam); } + + updateSubProcessDefinitionByParent(parentProcessInstance, childDefineId); + Command command = new Command(); command.setWarningType(parentProcessInstance.getWarningType()); command.setWarningGroupId(parentProcessInstance.getWarningGroupId()); @@ -904,6 +907,16 @@ public class ProcessDao extends AbstractBaseDao { logger.info("sub process command created: {} ", command.toString()); } + private void updateSubProcessDefinitionByParent(ProcessInstance parentProcessInstance, int childDefinitionId) { + ProcessDefinition fatherDefinition = this.findProcessDefineById(parentProcessInstance.getProcessDefinitionId()); + ProcessDefinition childDefinition = this.findProcessDefineById(childDefinitionId); + if(childDefinition != null && fatherDefinition != null){ + childDefinition.setReceivers(fatherDefinition.getReceivers()); + childDefinition.setReceiversCc(fatherDefinition.getReceiversCc()); + processDefineMapper.update(childDefinition); + } + } + /** * submit task to mysql * @param taskInstance From ae73bf7212b36fd2569295cf9652d142afb65133 Mon Sep 17 00:00:00 2001 From: lenboo Date: Wed, 17 Jul 2019 19:52:02 +0800 Subject: [PATCH 03/15] process definition update receiver and receiveCc field. --- .../dao/mapper/ProcessDefinitionMapperProvider.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessDefinitionMapperProvider.java b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessDefinitionMapperProvider.java index 48e8d0bdf0..3177dc4967 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessDefinitionMapperProvider.java +++ b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessDefinitionMapperProvider.java @@ -55,6 +55,8 @@ public class ProcessDefinitionMapperProvider { VALUES("`connects`", "#{processDefinition.connects}"); VALUES("`create_time`", "#{processDefinition.createTime}"); VALUES("`update_time`", "#{processDefinition.updateTime}"); + VALUES("`receivers` ","#{processDefinition.receivers}"); + VALUES("`receivers_cc`", "#{processDefinition.receivers_cc}"); VALUES("`timeout`", "#{processDefinition.timeout}"); VALUES("`flag`", EnumFieldUtil.genFieldStr("processDefinition.flag", ReleaseState.class)); VALUES("`user_id`", "#{processDefinition.userId}"); @@ -101,6 +103,8 @@ public class ProcessDefinitionMapperProvider { SET("`global_params`=#{processDefinition.globalParams}"); SET("`create_time`=#{processDefinition.createTime}"); SET("`update_time`=#{processDefinition.updateTime}"); + SET("`receivers`=#{processDefinition.receivers}"); + SET("`receivers_cc`=#{processDefinition.receivers_cc}"); SET("`timeout`=#{processDefinition.timeout}"); SET("`flag`="+EnumFieldUtil.genFieldStr("processDefinition.flag", Flag.class)); SET("`user_id`=#{processDefinition.userId}"); From 0b1a3906110b68625c921833ab51ccd8272f85fe Mon Sep 17 00:00:00 2001 From: lenboo Date: Wed, 17 Jul 2019 19:57:58 +0800 Subject: [PATCH 04/15] process definition update receiver and receiveCc field. --- .../escheduler/dao/mapper/ProcessDefinitionMapperProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessDefinitionMapperProvider.java b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessDefinitionMapperProvider.java index 3177dc4967..2416c5dab1 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessDefinitionMapperProvider.java +++ b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessDefinitionMapperProvider.java @@ -56,7 +56,7 @@ public class ProcessDefinitionMapperProvider { VALUES("`create_time`", "#{processDefinition.createTime}"); VALUES("`update_time`", "#{processDefinition.updateTime}"); VALUES("`receivers` ","#{processDefinition.receivers}"); - VALUES("`receivers_cc`", "#{processDefinition.receivers_cc}"); + VALUES("`receivers_cc`", "#{processDefinition.receiversCc}"); VALUES("`timeout`", "#{processDefinition.timeout}"); VALUES("`flag`", EnumFieldUtil.genFieldStr("processDefinition.flag", ReleaseState.class)); VALUES("`user_id`", "#{processDefinition.userId}"); From c6eaa0bcbb3c158773ed01b775734256f88e6827 Mon Sep 17 00:00:00 2001 From: lenboo Date: Wed, 17 Jul 2019 20:03:01 +0800 Subject: [PATCH 05/15] process definition update receiver and receiveCc field. --- .../escheduler/dao/mapper/ProcessDefinitionMapperProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessDefinitionMapperProvider.java b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessDefinitionMapperProvider.java index 2416c5dab1..fe1dead585 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessDefinitionMapperProvider.java +++ b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessDefinitionMapperProvider.java @@ -104,7 +104,7 @@ public class ProcessDefinitionMapperProvider { SET("`create_time`=#{processDefinition.createTime}"); SET("`update_time`=#{processDefinition.updateTime}"); SET("`receivers`=#{processDefinition.receivers}"); - SET("`receivers_cc`=#{processDefinition.receivers_cc}"); + SET("`receivers_cc`=#{processDefinition.receiversCc}"); SET("`timeout`=#{processDefinition.timeout}"); SET("`flag`="+EnumFieldUtil.genFieldStr("processDefinition.flag", Flag.class)); SET("`user_id`=#{processDefinition.userId}"); From 85969754799d41b6c6fc489bfa4c34a6d5f972da Mon Sep 17 00:00:00 2001 From: qiaozhanwei <825193156@qq.com> Date: Wed, 17 Jul 2019 20:08:34 +0800 Subject: [PATCH 06/15] install workersFailover value update --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 6fd9e83de2..e27b6ae061 100644 --- a/install.sh +++ b/install.sh @@ -170,7 +170,7 @@ workersLock="/escheduler/lock/workers" mastersFailover="/escheduler/lock/failover/masters" # zk worker容错分布式锁 -workersFailover="/escheduler/lock/failover/masters" +workersFailover="/escheduler/lock/failover/workers" # zk master启动容错分布式锁 mastersStartupFailover="/escheduler/lock/failover/startup-masters" From c8662bd83606854cdd25e54ac199f156f00fd9fb Mon Sep 17 00:00:00 2001 From: lgcareer <18610854716@163.com> Date: Thu, 18 Jul 2019 12:55:59 +0800 Subject: [PATCH 07/15] The task timeout need deletes the child process --- .../server/worker/task/AbstractCommandExecutor.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/AbstractCommandExecutor.java b/escheduler-server/src/main/java/cn/escheduler/server/worker/task/AbstractCommandExecutor.java index e3bd401393..82c9be9f0e 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/AbstractCommandExecutor.java +++ b/escheduler-server/src/main/java/cn/escheduler/server/worker/task/AbstractCommandExecutor.java @@ -162,7 +162,12 @@ public abstract class AbstractCommandExecutor { exitStatusCode = updateState(processDao, exitStatusCode, pid, taskInstId); } else { - cancelApplication(); + TaskInstance taskInstance = processDao.findTaskInstanceById(taskInstId); + if (taskInstance == null) { + logger.error("task instance id:{} not exist", taskInstId); + } else { + ProcessUtils.kill(taskInstance); + } exitStatusCode = -1; logger.warn("process timeout, work dir:{}, pid:{}", taskDir, pid); } From 0c6bf7b720a23118266d045dcbd822e16f4e0b2c Mon Sep 17 00:00:00 2001 From: easyscheduler Date: Thu, 18 Jul 2019 14:14:51 +0800 Subject: [PATCH 08/15] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bbf1942075..1c17faf149 100644 --- a/README.md +++ b/README.md @@ -84,7 +84,7 @@ https://github.com/analysys/EasyScheduler/blob/master/CONTRIBUTING.md ### Thanks Easy Scheduler uses a lot of excellent open source projects, such as google guava, guice, grpc, netty, ali bonecp, quartz, and many open source projects of apache, etc. -It is because of the shoulders of these open source projects that the birth of the Easy Scheduler is possible. We are very grateful for all the open source software used! We also hope that we will not only be the beneficiaries of open source, but also be open source contributors, so we decided to contribute to easy scheduling and promised long-term updates. I also hope that partners who have the same passion and conviction for open source will join in and contribute to open source! +It is because of the shoulders of these open source projects that the birth of the Easy Scheduler is possible. We are very grateful for all the open source software used! We also hope that we will not only be the beneficiaries of open source, but also be open source contributors, so we decided to contribute to easy scheduling and promised long-term updates. We also hope that partners who have the same passion and conviction for open source will join in and contribute to open source! ### Help The fastest way to get response from our developers is to submit issues, or add our wechat : 510570367 From 3d11e67e53e908015da7bd44a0cece01acfb4455 Mon Sep 17 00:00:00 2001 From: lgcareer <18610854716@163.com> Date: Thu, 18 Jul 2019 14:21:38 +0800 Subject: [PATCH 09/15] change datasource default setting --- .../src/main/resources/dao/data_source.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/escheduler-dao/src/main/resources/dao/data_source.properties b/escheduler-dao/src/main/resources/dao/data_source.properties index 3c89dd1fd2..cac3aa5e20 100644 --- a/escheduler-dao/src/main/resources/dao/data_source.properties +++ b/escheduler-dao/src/main/resources/dao/data_source.properties @@ -1,9 +1,9 @@ # base spring data source configuration spring.datasource.type=com.alibaba.druid.pool.DruidDataSource spring.datasource.driver-class-name=com.mysql.jdbc.Driver -spring.datasource.url=jdbc:mysql://192.168.220.188:3306/escheduler_new?characterEncoding=UTF-8 -spring.datasource.username=root -spring.datasource.password=root@123 +spring.datasource.url=jdbc:mysql://192.168.xx.xx:3306/escheduler?characterEncoding=UTF-8 +spring.datasource.username=xx +spring.datasource.password=xx # connection configuration spring.datasource.initialSize=5 From 5e36557cb4b6248c0306e5ff1af39260149a7561 Mon Sep 17 00:00:00 2001 From: easyscheduler Date: Thu, 18 Jul 2019 14:30:26 +0800 Subject: [PATCH 10/15] Update README.md --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1c17faf149..6506b16dad 100644 --- a/README.md +++ b/README.md @@ -86,8 +86,11 @@ https://github.com/analysys/EasyScheduler/blob/master/CONTRIBUTING.md Easy Scheduler uses a lot of excellent open source projects, such as google guava, guice, grpc, netty, ali bonecp, quartz, and many open source projects of apache, etc. It is because of the shoulders of these open source projects that the birth of the Easy Scheduler is possible. We are very grateful for all the open source software used! We also hope that we will not only be the beneficiaries of open source, but also be open source contributors, so we decided to contribute to easy scheduling and promised long-term updates. We also hope that partners who have the same passion and conviction for open source will join in and contribute to open source! -### Help +### Get Help The fastest way to get response from our developers is to submit issues, or add our wechat : 510570367 + +### License +Please refer to [LICENSE](https://github.com/analysys/EasyScheduler/blob/dev/LICENSE) file. From 970855192b41ecb8553e5d4663ab5a18327b9c19 Mon Sep 17 00:00:00 2001 From: lgcareer <18610854716@163.com> Date: Thu, 18 Jul 2019 16:12:44 +0800 Subject: [PATCH 11/15] [maven-release-plugin] prepare release 1.0.5 --- escheduler-alert/pom.xml | 2 +- escheduler-api/pom.xml | 2 +- escheduler-common/pom.xml | 2 +- escheduler-dao/pom.xml | 2 +- escheduler-rpc/pom.xml | 2 +- escheduler-server/pom.xml | 2 +- pom.xml | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/escheduler-alert/pom.xml b/escheduler-alert/pom.xml index 58c9df4a51..8ca081c1d1 100644 --- a/escheduler-alert/pom.xml +++ b/escheduler-alert/pom.xml @@ -4,7 +4,7 @@ cn.analysys escheduler - 1.0.4-SNAPSHOT + 1.0.5 escheduler-alert jar diff --git a/escheduler-api/pom.xml b/escheduler-api/pom.xml index 1d0431ea52..b449248c0e 100644 --- a/escheduler-api/pom.xml +++ b/escheduler-api/pom.xml @@ -3,7 +3,7 @@ cn.analysys escheduler - 1.0.4-SNAPSHOT + 1.0.5 escheduler-api jar diff --git a/escheduler-common/pom.xml b/escheduler-common/pom.xml index cf5ba6048b..312ec9c2af 100644 --- a/escheduler-common/pom.xml +++ b/escheduler-common/pom.xml @@ -4,7 +4,7 @@ escheduler cn.analysys - 1.0.4-SNAPSHOT + 1.0.5 escheduler-common escheduler-common diff --git a/escheduler-dao/pom.xml b/escheduler-dao/pom.xml index 42e2f8730a..3a432f63b0 100644 --- a/escheduler-dao/pom.xml +++ b/escheduler-dao/pom.xml @@ -4,7 +4,7 @@ cn.analysys escheduler - 1.0.4-SNAPSHOT + 1.0.5 escheduler-dao escheduler-dao diff --git a/escheduler-rpc/pom.xml b/escheduler-rpc/pom.xml index 4ec4ea2260..f2ace5bad8 100644 --- a/escheduler-rpc/pom.xml +++ b/escheduler-rpc/pom.xml @@ -4,7 +4,7 @@ escheduler cn.analysys - 1.0.4-SNAPSHOT + 1.0.5 4.0.0 diff --git a/escheduler-server/pom.xml b/escheduler-server/pom.xml index cd33d49006..b3e996d42d 100644 --- a/escheduler-server/pom.xml +++ b/escheduler-server/pom.xml @@ -3,7 +3,7 @@ escheduler cn.analysys - 1.0.4-SNAPSHOT + 1.0.5 escheduler-server escheduler-server diff --git a/pom.xml b/pom.xml index ea4545d787..a08170f274 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 cn.analysys escheduler - 1.0.4-SNAPSHOT + 1.0.5 pom escheduler http://maven.apache.org @@ -390,7 +390,7 @@ scm:git:https://github.com/analysys/EasyScheduler.git scm:git:https://github.com/analysys/EasyScheduler.git https://github.com/analysys/EasyScheduler.git - HEAD + 1.0.5 From c6fe2a7d61a584c7c56e604d1240c1e869810b47 Mon Sep 17 00:00:00 2001 From: lgcareer <18610854716@163.com> Date: Thu, 18 Jul 2019 16:13:08 +0800 Subject: [PATCH 12/15] [maven-release-plugin] prepare for next development iteration --- escheduler-alert/pom.xml | 2 +- escheduler-api/pom.xml | 2 +- escheduler-common/pom.xml | 2 +- escheduler-dao/pom.xml | 2 +- escheduler-rpc/pom.xml | 2 +- escheduler-server/pom.xml | 2 +- pom.xml | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/escheduler-alert/pom.xml b/escheduler-alert/pom.xml index 8ca081c1d1..1c46876fb8 100644 --- a/escheduler-alert/pom.xml +++ b/escheduler-alert/pom.xml @@ -4,7 +4,7 @@ cn.analysys escheduler - 1.0.5 + 1.0.5-SNAPSHOT escheduler-alert jar diff --git a/escheduler-api/pom.xml b/escheduler-api/pom.xml index b449248c0e..a5c16e9480 100644 --- a/escheduler-api/pom.xml +++ b/escheduler-api/pom.xml @@ -3,7 +3,7 @@ cn.analysys escheduler - 1.0.5 + 1.0.5-SNAPSHOT escheduler-api jar diff --git a/escheduler-common/pom.xml b/escheduler-common/pom.xml index 312ec9c2af..c66f81cdfa 100644 --- a/escheduler-common/pom.xml +++ b/escheduler-common/pom.xml @@ -4,7 +4,7 @@ escheduler cn.analysys - 1.0.5 + 1.0.5-SNAPSHOT escheduler-common escheduler-common diff --git a/escheduler-dao/pom.xml b/escheduler-dao/pom.xml index 3a432f63b0..db3fde5987 100644 --- a/escheduler-dao/pom.xml +++ b/escheduler-dao/pom.xml @@ -4,7 +4,7 @@ cn.analysys escheduler - 1.0.5 + 1.0.5-SNAPSHOT escheduler-dao escheduler-dao diff --git a/escheduler-rpc/pom.xml b/escheduler-rpc/pom.xml index f2ace5bad8..1bc53472fd 100644 --- a/escheduler-rpc/pom.xml +++ b/escheduler-rpc/pom.xml @@ -4,7 +4,7 @@ escheduler cn.analysys - 1.0.5 + 1.0.5-SNAPSHOT 4.0.0 diff --git a/escheduler-server/pom.xml b/escheduler-server/pom.xml index b3e996d42d..2a8663bc60 100644 --- a/escheduler-server/pom.xml +++ b/escheduler-server/pom.xml @@ -3,7 +3,7 @@ escheduler cn.analysys - 1.0.5 + 1.0.5-SNAPSHOT escheduler-server escheduler-server diff --git a/pom.xml b/pom.xml index a08170f274..449f1a97de 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 cn.analysys escheduler - 1.0.5 + 1.0.5-SNAPSHOT pom escheduler http://maven.apache.org @@ -390,7 +390,7 @@ scm:git:https://github.com/analysys/EasyScheduler.git scm:git:https://github.com/analysys/EasyScheduler.git https://github.com/analysys/EasyScheduler.git - 1.0.5 + HEAD From df9d89f4f7442a330dce4ffb98ab4a58279d9ba7 Mon Sep 17 00:00:00 2001 From: easyscheduler Date: Thu, 18 Jul 2019 16:30:31 +0800 Subject: [PATCH 13/15] Update README.md --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 6506b16dad..12eb925dce 100644 --- a/README.md +++ b/README.md @@ -31,21 +31,21 @@ Its main objectives are as follows:   | EasyScheduler | Azkaban | Airflow -- | -- | -- | -- **Stability** |   |   |   -Single point of failure | Decentralized multi-master and multi-worker | Yes Single Web and Scheduler Combination Node | Yes. Single Scheduler +Single point of failure | Decentralized multi-master and multi-worker | Yes
Single Web and Scheduler Combination Node | Yes
Single Scheduler Additional HA requirements | Not required (HA is supported by itself) | DB | Celery / Dask / Mesos + Load Balancer + DB Overload processing | Task queue mechanism, the number of schedulable tasks on a single machine can be flexibly configured, when too many tasks will be cached in the task queue, will not cause machine jam. | Jammed the server when there are too many tasks | Jammed the server when there are too many tasks **Easy to use** |   |   |   -DAG Monitoring Interface | Visualization process defines key information such as task status, task type, retry times, task running machine, visual variables and so on at a glance. | Only task status can be seen | Can't visually distinguish task types -Visual process definition | Yes All process definition operations are visualized, dragging tasks to draw DAGs, configuring data sources and resources. At the same time, for third-party systems, the api mode operation is provided. | No DAG and custom upload via custom DSL | No DAG is drawn through Python code, which is inconvenient to use, especially for business people who can't write code. -Quick deployment | One-click deployment | Complex clustering deployment | Complex clustering deployment +DAG Monitoring Interface | Visualization process defines key information such as task status, task type, retry times, task running machine, visual variables and so on at a glance. | Only task status can be seen | Can't visually distinguish task types +Visual process definition | Yes
All process definition operations are visualized, dragging tasks to draw DAGs, configuring data sources and resources. At the same time, for third-party systems, the api mode operation is provided. | No
DAG and custom upload via custom DSL | No
DAG is drawn through Python code, which is inconvenient to use, especially for business people who can't write code. +Quick deployment | One-click deployment | Complex clustering deployment | Complex clustering deployment **Features** |   |   |   -Suspend and resume | Support pause, recover operation | No Can only kill the workflow first and then re-run | No Can only kill the workflow first and then re-run +Suspend and resume | Support pause, recover operation | No
Can only kill the workflow first and then re-run | No
Can only kill the workflow first and then re-run Whether to support multiple tenants | Users on easyscheduler can achieve many-to-one or one-to-one mapping relationship through tenants and Hadoop users, which is very important for scheduling large data jobs. " Supports traditional shell tasks, while supporting large data platform task scheduling: MR, Spark, SQL (mysql, postgresql, hive, sparksql), Python, Procedure, Sub_Process | No | No Task type | Supports traditional shell tasks, and also support big data platform task scheduling: MR, Spark, SQL (mysql, postgresql, hive, sparksql), Python, Procedure, Sub_Process | shell、gobblin、hadoopJava、java、hive、pig、spark、hdfsToTeradata、teradataToHdfs | BashOperator、DummyOperator、MySqlOperator、HiveOperator、EmailOperator、HTTPOperator、SqlOperator Compatibility | Support the scheduling of big data jobs like spark, hive, Mr. At the same time, it is more compatible with big data business because it supports multiple tenants. | Because it does not support multi-tenant, it is not flexible enough to use business in big data platform. | Because it does not support multi-tenant, it is not flexible enough to use business in big data platform. **Scalability** |   |   |   Whether to support custom task types | Yes | Yes | Yes -Is Cluster Extension Supported? | Yes The scheduler uses distributed scheduling, and the overall scheduling capability will increase linearly with the scale of the cluster. Master and Worker support dynamic online and offline. | Yes, but complicated Executor horizontal extend | Yes, but complicated Executor horizontal extend +Is Cluster Extension Supported? | Yes
The scheduler uses distributed scheduling, and the overall scheduling capability will increase linearly with the scale of the cluster. Master and Worker support dynamic online and offline. | Yes
but complicated Executor horizontal extend | Yes
but complicated Executor horizontal extend From 4674d939b0ac7bd1ef8fbc700d990622c737a980 Mon Sep 17 00:00:00 2001 From: lgcareer <18610854716@163.com> Date: Thu, 18 Jul 2019 17:20:30 +0800 Subject: [PATCH 14/15] [maven-release-plugin] prepare release 1.1.0-preview --- escheduler-alert/pom.xml | 2 +- escheduler-api/pom.xml | 2 +- escheduler-common/pom.xml | 2 +- escheduler-dao/pom.xml | 2 +- escheduler-rpc/pom.xml | 2 +- escheduler-server/pom.xml | 2 +- pom.xml | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/escheduler-alert/pom.xml b/escheduler-alert/pom.xml index be8b5fbb6d..cda2488c36 100644 --- a/escheduler-alert/pom.xml +++ b/escheduler-alert/pom.xml @@ -4,7 +4,7 @@ cn.analysys escheduler - 1.1.0-SNAPSHOT + 1.1.0 escheduler-alert jar diff --git a/escheduler-api/pom.xml b/escheduler-api/pom.xml index 2ac260f314..7f7c51de61 100644 --- a/escheduler-api/pom.xml +++ b/escheduler-api/pom.xml @@ -3,7 +3,7 @@ cn.analysys escheduler - 1.1.0-SNAPSHOT + 1.1.0 escheduler-api jar diff --git a/escheduler-common/pom.xml b/escheduler-common/pom.xml index 35b025b1d8..cc2bb36717 100644 --- a/escheduler-common/pom.xml +++ b/escheduler-common/pom.xml @@ -4,7 +4,7 @@ escheduler cn.analysys - 1.1.0-SNAPSHOT + 1.1.0 escheduler-common escheduler-common diff --git a/escheduler-dao/pom.xml b/escheduler-dao/pom.xml index 4d8fb6912e..3eb6dbf3e0 100644 --- a/escheduler-dao/pom.xml +++ b/escheduler-dao/pom.xml @@ -4,7 +4,7 @@ cn.analysys escheduler - 1.1.0-SNAPSHOT + 1.1.0 escheduler-dao escheduler-dao diff --git a/escheduler-rpc/pom.xml b/escheduler-rpc/pom.xml index e3d7c91a92..4687d1e462 100644 --- a/escheduler-rpc/pom.xml +++ b/escheduler-rpc/pom.xml @@ -4,7 +4,7 @@ escheduler cn.analysys - 1.1.0-SNAPSHOT + 1.1.0 4.0.0 diff --git a/escheduler-server/pom.xml b/escheduler-server/pom.xml index 7f149278c8..ac9a312734 100644 --- a/escheduler-server/pom.xml +++ b/escheduler-server/pom.xml @@ -3,7 +3,7 @@ escheduler cn.analysys - 1.1.0-SNAPSHOT + 1.1.0 escheduler-server escheduler-server diff --git a/pom.xml b/pom.xml index a97650aafb..93ac6f8ee9 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 cn.analysys escheduler - 1.1.0-SNAPSHOT + 1.1.0 pom escheduler http://maven.apache.org @@ -382,7 +382,7 @@ scm:git:https://github.com/analysys/EasyScheduler.git scm:git:https://github.com/analysys/EasyScheduler.git https://github.com/analysys/EasyScheduler.git - HEAD + 1.1.0-preview From f9c0800898fc8ca265d29a7c5e76b7caf01d891f Mon Sep 17 00:00:00 2001 From: lgcareer <18610854716@163.com> Date: Thu, 18 Jul 2019 17:20:59 +0800 Subject: [PATCH 15/15] [maven-release-plugin] prepare for next development iteration --- escheduler-alert/pom.xml | 2 +- escheduler-api/pom.xml | 2 +- escheduler-common/pom.xml | 2 +- escheduler-dao/pom.xml | 2 +- escheduler-rpc/pom.xml | 2 +- escheduler-server/pom.xml | 2 +- pom.xml | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/escheduler-alert/pom.xml b/escheduler-alert/pom.xml index cda2488c36..be8b5fbb6d 100644 --- a/escheduler-alert/pom.xml +++ b/escheduler-alert/pom.xml @@ -4,7 +4,7 @@ cn.analysys escheduler - 1.1.0 + 1.1.0-SNAPSHOT escheduler-alert jar diff --git a/escheduler-api/pom.xml b/escheduler-api/pom.xml index 7f7c51de61..2ac260f314 100644 --- a/escheduler-api/pom.xml +++ b/escheduler-api/pom.xml @@ -3,7 +3,7 @@ cn.analysys escheduler - 1.1.0 + 1.1.0-SNAPSHOT escheduler-api jar diff --git a/escheduler-common/pom.xml b/escheduler-common/pom.xml index cc2bb36717..35b025b1d8 100644 --- a/escheduler-common/pom.xml +++ b/escheduler-common/pom.xml @@ -4,7 +4,7 @@ escheduler cn.analysys - 1.1.0 + 1.1.0-SNAPSHOT escheduler-common escheduler-common diff --git a/escheduler-dao/pom.xml b/escheduler-dao/pom.xml index 3eb6dbf3e0..4d8fb6912e 100644 --- a/escheduler-dao/pom.xml +++ b/escheduler-dao/pom.xml @@ -4,7 +4,7 @@ cn.analysys escheduler - 1.1.0 + 1.1.0-SNAPSHOT escheduler-dao escheduler-dao diff --git a/escheduler-rpc/pom.xml b/escheduler-rpc/pom.xml index 4687d1e462..e3d7c91a92 100644 --- a/escheduler-rpc/pom.xml +++ b/escheduler-rpc/pom.xml @@ -4,7 +4,7 @@ escheduler cn.analysys - 1.1.0 + 1.1.0-SNAPSHOT 4.0.0 diff --git a/escheduler-server/pom.xml b/escheduler-server/pom.xml index ac9a312734..7f149278c8 100644 --- a/escheduler-server/pom.xml +++ b/escheduler-server/pom.xml @@ -3,7 +3,7 @@ escheduler cn.analysys - 1.1.0 + 1.1.0-SNAPSHOT escheduler-server escheduler-server diff --git a/pom.xml b/pom.xml index 93ac6f8ee9..a97650aafb 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 cn.analysys escheduler - 1.1.0 + 1.1.0-SNAPSHOT pom escheduler http://maven.apache.org @@ -382,7 +382,7 @@ scm:git:https://github.com/analysys/EasyScheduler.git scm:git:https://github.com/analysys/EasyScheduler.git https://github.com/analysys/EasyScheduler.git - 1.1.0-preview + HEAD