From 7b98618068b336a96f134f5dfca54af6ccdf1492 Mon Sep 17 00:00:00 2001 From: baoliang Date: Wed, 3 Apr 2019 11:23:12 +0800 Subject: [PATCH 1/4] change image of shell in readme --- docs/zh_CN/后端部署文档.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/docs/zh_CN/后端部署文档.md b/docs/zh_CN/后端部署文档.md index dfba8a5962..4f4430ba87 100644 --- a/docs/zh_CN/后端部署文档.md +++ b/docs/zh_CN/后端部署文档.md @@ -529,10 +529,14 @@ sh ./bin/escheduler-daemon.sh stop alert-server - 安装 pip install kazoo -- 使用部署用户 sh install.sh 一键部署 - - - 注意：scp_hosts.sh 里 `tar -zxvf $workDir/../escheduler-1.0.0.tar.gz -C $installPath` 中的版本号(1.0.0)需要执行前手动替换成对应的版本号 - +- 一键部署 + + - 将编译完成的escheduler-1.0.0.tar.gz包放在install.sh同级目录下 + + - 注意：scp_hosts.sh 里 `tar -zxvf $workDir/../escheduler-1.0.0.tar.gz -C $installPath` 中的版本号(1.0.0)需要执行前手动替换成对应的版本号 + + - 使用部署用户 sh install.sh + ## 服务监控 monitor_server.py 脚本是监听，master和worker服务挂掉重启的脚本 From 447189622c17f937e529cb49b81e40b3cb41d867 Mon Sep 17 00:00:00 2001 From: baoliang Date: Mon, 8 Apr 2019 11:26:58 +0800 Subject: [PATCH 2/4] fix bug spelling error in process dao --- escheduler-dao/src/main/java/cn/escheduler/dao/ProcessDao.java | 2 +- .../src/main/java/cn/escheduler/server/zk/ZKMasterClient.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 e01150e207..c6164c4523 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/ProcessDao.java +++ b/escheduler-dao/src/main/java/cn/escheduler/dao/ProcessDao.java @@ -1272,7 +1272,7 @@ public class ProcessDao extends AbstractBaseDao { return scheduleMapper.queryById(id); } - public List queryNeddFailoverProcessInstances(String host){ + public List queryNeedFailoverProcessInstances(String host){ return processInstanceMapper.queryByHostAndStatus(host, stateArray); } diff --git a/escheduler-server/src/main/java/cn/escheduler/server/zk/ZKMasterClient.java b/escheduler-server/src/main/java/cn/escheduler/server/zk/ZKMasterClient.java index 113ef5de9f..624d0193be 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/zk/ZKMasterClient.java +++ b/escheduler-server/src/main/java/cn/escheduler/server/zk/ZKMasterClient.java @@ -256,7 +256,7 @@ public class ZKMasterClient extends AbstractZKClient { logger.info("start master failover ..."); - List needFailoverProcessInstanceList = processDao.queryNeddFailoverProcessInstances(masterHost); + List needFailoverProcessInstanceList = processDao.queryNeedFailoverProcessInstances(masterHost); //updateProcessInstance host is null and insert into command for(ProcessInstance processInstance : needFailoverProcessInstanceList){ From c146620435fd87bdca393fd4de38b1ef81c400cd Mon Sep 17 00:00:00 2001 From: baoliang Date: Mon, 8 Apr 2019 11:34:39 +0800 Subject: [PATCH 3/4] revert from upstream dev --- docs/zh_CN/后端部署文档.md | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/docs/zh_CN/后端部署文档.md b/docs/zh_CN/后端部署文档.md index 6c64f1357b..4559e4b817 100644 --- a/docs/zh_CN/后端部署文档.md +++ b/docs/zh_CN/后端部署文档.md @@ -542,13 +542,9 @@ sh ./bin/escheduler-daemon.sh stop alert-server ``` -- 一键部署 +- 使用部署用户 sh install.sh 一键部署 - - 将编译完成的escheduler-1.0.0.tar.gz包放在install.sh同级目录下 - - - 注意：scp_hosts.sh 里 `tar -zxvf $workDir/../escheduler-1.0.0.tar.gz -C $installPath` 中的版本号(1.0.0)需要执行前手动替换成对应的版本号 - - - 使用部署用户 sh install.sh + - 注意：scp_hosts.sh 里 `tar -zxvf $workDir/../escheduler-1.0.0.tar.gz -C $installPath` 中的版本号(1.0.0)需要执行前手动替换成对应的版本号 ## 服务监控 From 94ea607f06c4c1766709d13a58599b8c7142733e Mon Sep 17 00:00:00 2001 From: baoliang Date: Mon, 8 Apr 2019 14:32:31 +0800 Subject: [PATCH 4/4] fix bug, update action would change the user of definition. --- .../api/controller/ProcessDefinitionController.java | 2 +- .../escheduler/api/service/ProcessDefinitionService.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/escheduler-api/src/main/java/cn/escheduler/api/controller/ProcessDefinitionController.java b/escheduler-api/src/main/java/cn/escheduler/api/controller/ProcessDefinitionController.java index 9cf27a32ed..ec1f38b0ce 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/controller/ProcessDefinitionController.java +++ b/escheduler-api/src/main/java/cn/escheduler/api/controller/ProcessDefinitionController.java @@ -127,7 +127,7 @@ public class ProcessDefinitionController extends BaseController{ logger.info("login user {}, update process define, project name: {}, process define name: {}, " + "process_definition_json: {}, desc: {}, locations:{}, connects:{}", loginUser.getUserName(), projectName, name, processDefinitionJson,desc, locations, connects); - Map result = processDefinitionService.updateProccessDefinition(loginUser, projectName, id, name, + Map result = processDefinitionService.updateProcessDefinition(loginUser, projectName, id, name, processDefinitionJson, desc, locations, connects); return returnDataList(result); }catch (Exception e){ 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 1b0d806967..119c840e56 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 @@ -247,9 +247,9 @@ public class ProcessDefinitionService extends BaseDAGService { * @param connects * @return */ - public Map updateProccessDefinition(User loginUser, String projectName, int id, String name, - String processDefinitionJson, String desc, - String locations, String connects) throws JsonProcessingException { + public Map updateProcessDefinition(User loginUser, String projectName, int id, String name, + String processDefinitionJson, String desc, + String locations, String connects) { Map result = new HashMap<>(5); Project project = projectMapper.queryByName(projectName); @@ -284,7 +284,6 @@ public class ProcessDefinitionService extends BaseDAGService { processDefine.setName(name); processDefine.setReleaseState(ReleaseState.OFFLINE); processDefine.setProjectId(project.getId()); - processDefine.setUserId(loginUser.getId()); processDefine.setProcessDefinitionJson(processDefinitionJson); processDefine.setDesc(desc); processDefine.setLocations(locations);