From 43ac53bc481b0fe0f33b567825550bd76529d875 Mon Sep 17 00:00:00 2001 From: ligang Date: Thu, 25 Apr 2019 20:18:10 +0800 Subject: [PATCH 1/2] update upgradeEscheduler --- .../main/java/cn/escheduler/dao/upgrade/EschedulerManager.java | 1 + .../java/cn/escheduler/dao/upgrade/shell/UpgradeEscheduler.java | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/EschedulerManager.java b/escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/EschedulerManager.java index 0df98ec56e..15448021c3 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/EschedulerManager.java +++ b/escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/EschedulerManager.java @@ -66,6 +66,7 @@ public class EschedulerManager { version = "1.0.0"; }else{ logger.error("Unable to determine current software version, so cannot upgrade"); + throw new RuntimeException("Unable to determine current software version, so cannot upgrade"); } // The target version of the upgrade String schemaVersion = ""; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/shell/UpgradeEscheduler.java b/escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/shell/UpgradeEscheduler.java index e73a1162c2..822e020cad 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/shell/UpgradeEscheduler.java +++ b/escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/shell/UpgradeEscheduler.java @@ -27,8 +27,6 @@ public class UpgradeEscheduler { private static final Logger logger = LoggerFactory.getLogger(UpgradeEscheduler.class); public static void main(String[] args) { - Thread.currentThread().setName("manager-UpgradeEscheduler"); - EschedulerManager eschedulerManager = new EschedulerManager(); try { eschedulerManager.upgradeEscheduler(); From 696e224be527c7329498f7abac281da17e2547a6 Mon Sep 17 00:00:00 2001 From: ligang Date: Thu, 25 Apr 2019 20:39:06 +0800 Subject: [PATCH 2/2] update create and upgrade introduce --- docs/zh_CN/后端部署文档.md | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/docs/zh_CN/后端部署文档.md b/docs/zh_CN/后端部署文档.md index fdbf37da23..48fcebeda0 100644 --- a/docs/zh_CN/后端部署文档.md +++ b/docs/zh_CN/后端部署文档.md @@ -57,7 +57,7 @@ escheduler ALL=(ALL) NOPASSWD: NOPASSWD: ALL flush privileges; ``` -* 创建表和导入基础数据 +* 1.0.0和1.0.1版本创建表和导入基础数据 说明：在escheduler-backend/sql/escheduler.sql和quartz.sql ```sql @@ -66,6 +66,12 @@ escheduler ALL=(ALL) NOPASSWD: NOPASSWD: ALL mysql -h {host} -u {user} -p{password} -D {db} < quartz.sql ``` +* 1.0.2版本创建表和导入基础数据 + + ``` + sh ./script/create_escheduler.sh + ``` + #### 准备五: 修改部署目录权限及运行参数 我们先来大体了解下解压后escheduler-backend目录下的文件(夹)的作用 @@ -188,5 +194,7 @@ sh ./bin/escheduler-daemon.sh stop alert-server ``` ## 3、数据库升级 -数据库升级是在1.0.2版本增加的功能,执行以下命令即可自动升级数据库。 -sh ./script/upgrade_escheduler.sh \ No newline at end of file +数据库升级是在1.0.2版本增加的功能,执行以下命令即可自动升级数据库 +``` +sh ./script/upgrade_escheduler.sh +``` \ No newline at end of file