From 983fefc13c9db8645a9fd7c66aa090f19472ad9e Mon Sep 17 00:00:00 2001 From: ligang Date: Fri, 24 May 2019 11:28:29 +0800 Subject: [PATCH 1/4] add monitorServerState in 1.0.3 --- docs/zh_CN/后端部署文档.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/zh_CN/后端部署文档.md b/docs/zh_CN/后端部署文档.md index 4851686b65..f2df8a6989 100644 --- a/docs/zh_CN/后端部署文档.md +++ b/docs/zh_CN/后端部署文档.md @@ -4,7 +4,7 @@ ## 1、准备工作 -目前最新安装包版本是1.0.2，下载地址： [码云下载](https://gitee.com/easyscheduler/EasyScheduler/attach_files/) ，下载escheduler-backend-1.0.2.tar.gz(后端简称escheduler-backend),escheduler-ui-1.0.2.tar.gz(前端简称escheduler-ui) +目前最新安装包版本是1.0.3，下载地址： [码云下载](https://gitee.com/easyscheduler/EasyScheduler/attach_files/) ，下载escheduler-backend-1.0.3.tar.gz(后端简称escheduler-backend),escheduler-ui-1.0.3.tar.gz(前端简称escheduler-ui) #### 准备一: 基础软件安装(必装项请自行安装) @@ -101,6 +101,12 @@ install.sh : 一键部署脚本 - 修改部署参数(根据自己服务器及业务情况): - 修改 **install.sh**中的各参数，替换成自身业务所需的值 + - monitorServerState 开关变量,在1.0.3版本中增加，控制是否启动自启动脚本(监控master,worker状态,如果掉线会自动启动) + 默认值为"false"表示不启动自启动脚本,如果需要启动改为"true" + + - hdfsStartupSate 开关变量，控制是否启动hdfs + 默认值为"false"表示不启动hdfs + 如果需要启动改为"true",启动hdfs需要自行创建hdfs根路径，也就是install.sh中的 hdfsPath - 如果使用hdfs相关功能，需要拷贝**hdfs-site.xml**和**core-site.xml**到conf目录下 @@ -143,7 +149,7 @@ install.sh : 一键部署脚本 ### 2.2 编译源码来部署 -将源码包release版本1.0.2下载后，解压进入根目录 +将源码包release版本1.0.3下载后，解压进入根目录 * 执行编译命令： From 950deba4c76f0aacb884b0813466b043cbce212c Mon Sep 17 00:00:00 2001 From: baoliang Date: Fri, 24 May 2019 14:31:09 +0800 Subject: [PATCH 2/4] change return null to empty list --- .../main/java/cn/escheduler/common/utils/JSONUtils.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/escheduler-common/src/main/java/cn/escheduler/common/utils/JSONUtils.java b/escheduler-common/src/main/java/cn/escheduler/common/utils/JSONUtils.java index 6efef083ea..9dad6ac542 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/utils/JSONUtils.java +++ b/escheduler-common/src/main/java/cn/escheduler/common/utils/JSONUtils.java @@ -27,10 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.TimeZone; +import java.util.*; /** * json utils @@ -109,7 +106,7 @@ public class JSONUtils { */ public static List toList(String json, Class clazz) { if (StringUtils.isEmpty(json)) { - return null; + return new ArrayList<>(); } try { return JSONArray.parseArray(json, clazz); @@ -117,7 +114,7 @@ public class JSONUtils { logger.error("JSONArray.parseArray exception!",e); } - return null; + return new ArrayList<>(); } From dc1c4d025595e8db8d3e9b02b603bcdb9b3eb641 Mon Sep 17 00:00:00 2001 From: baoliang Date: Fri, 24 May 2019 14:35:25 +0800 Subject: [PATCH 3/4] fix bug: cannot delete global_params field when updating definition --- .../cn/escheduler/api/service/ProcessDefinitionService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java b/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java index 7b20f516db..b83d474679 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java +++ b/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java @@ -293,12 +293,12 @@ public class ProcessDefinitionService extends BaseDAGService { processDefine.setTimeout(processData.getTimeout()); //custom global params - List globalParamsList = processData.getGlobalParams(); - if (globalParamsList != null && globalParamsList.size() > 0) { + List globalParamsList = new ArrayList<>(); + if (processData.getGlobalParams() != null && processData.getGlobalParams().size() > 0) { Set userDefParamsSet = new HashSet<>(globalParamsList); globalParamsList = new ArrayList<>(userDefParamsSet); - processDefine.setGlobalParamList(globalParamsList); } + processDefine.setGlobalParamList(globalParamsList); processDefine.setUpdateTime(now); processDefine.setFlag(Flag.YES); if (processDefineMapper.update(processDefine) > 0) { From 501795a5a7947c62cc1bb8ebedf3d63f85645de1 Mon Sep 17 00:00:00 2001 From: baoliang Date: Fri, 24 May 2019 14:48:30 +0800 Subject: [PATCH 4/4] update --- .../cn/escheduler/api/service/ProcessDefinitionService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java b/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java index b83d474679..45ff487f5e 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java +++ b/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java @@ -295,7 +295,7 @@ public class ProcessDefinitionService extends BaseDAGService { //custom global params List globalParamsList = new ArrayList<>(); if (processData.getGlobalParams() != null && processData.getGlobalParams().size() > 0) { - Set userDefParamsSet = new HashSet<>(globalParamsList); + Set userDefParamsSet = new HashSet<>(processData.getGlobalParams()); globalParamsList = new ArrayList<>(userDefParamsSet); } processDefine.setGlobalParamList(globalParamsList);