diff --git a/README.md b/README.md index 4157d9d01534e856fe4eb4967d702ad4266902b4..940029570304c93ef8b4e8fd44ff016dca047c60 100644 --- a/README.md +++ b/README.md @@ -42,13 +42,13 @@ portal/ portal.log pkg/ chameleon/ - chameleon-7.0.0rc1-py3-none-any.whl + chameleon-7.0.0rc2-py3-none-any.whl datacheck/ - gs_datacheck-7.0.0rc1.tar.gz + gs_datacheck-7.0.0rc2.tar.gz debezium/ confluent-community-5.5.1-2.12.zip - replicate-mysql2openGauss-7.0.0rc1.tar.gz - replicate-openGauss2mysql-7.0.0rc1.tar.gz + replicate-mysql2openGauss-7.0.0rc2.tar.gz + replicate-openGauss2mysql-7.0.0rc2.tar.gz tmp/ tools/ chameleon/ @@ -59,7 +59,7 @@ portal/ debezium-connector-mysql/ debezium-connector-opengauss/ portal.portId.lock - portalControl-7.0.0rc1-exec.jar + portalControl-7.0.0rc2-exec.jar gs_datacheck.sh gs_mysync.sh gs_rep_portal.sh @@ -79,7 +79,7 @@ portal的安装目录默认为/ops/portal,可根据实际需要更换。 git clone https://gitee.com/opengauss/openGauss-migration-portal.git ``` -2.使用maven命令编译源代码获得portalControl-7.0.0rc1-exec.jar,并将jar包放在/ops/portal下。 +2.使用maven命令编译源代码获得portalControl-7.0.0rc2-exec.jar,并将jar包放在/ops/portal下。 ``` mvn clean package -Dmaven.test.skip=true @@ -97,24 +97,24 @@ maven版本:3.8.1以上 | 系统名称 | 系统架构 | 下载链接 | |:---------------| -------- |----------------------------------------------------------------------------------------------------------------------| -| centos7 | x86_64 | https://opengauss.obs.cn-south-1.myhuaweicloud.com/latest/tools/centos7/PortalControl-7.0.0rc1-x86_64.tar.gz | -| openEuler20.03 | x86_64 | https://opengauss.obs.cn-south-1.myhuaweicloud.com/latest/tools/openEuler20.03/PortalControl-7.0.0rc1-x86_64.tar.gz | -| openEuler20.03 | aarch64 | https://opengauss.obs.cn-south-1.myhuaweicloud.com/latest/tools/openEuler20.03/PortalControl-7.0.0rc1-aarch64.tar.gz | -| openEuler22.03 | x86_64 | https://opengauss.obs.cn-south-1.myhuaweicloud.com/latest/tools/openEuler22.03/PortalControl-7.0.0rc1-x86_64.tar.gz | -| openEuler22.03 | aarch64 | https://opengauss.obs.cn-south-1.myhuaweicloud.com/latest/tools/openEuler22.03/PortalControl-7.0.0rc1-aarch64.tar.gz | -| openEuler24.03 | x86_64 | https://opengauss.obs.cn-south-1.myhuaweicloud.com/latest/tools/openEuler24.03/PortalControl-7.0.0rc1-x86_64.tar.gz | -| openEuler24.03 | aarch64 | https://opengauss.obs.cn-south-1.myhuaweicloud.com/latest/tools/openEuler24.03/PortalControl-7.0.0rc1-aarch64.tar.gz | +| centos7 | x86_64 | https://opengauss.obs.cn-south-1.myhuaweicloud.com/latest/tools/centos7/PortalControl-7.0.0rc2-x86_64.tar.gz | +| openEuler20.03 | x86_64 | https://opengauss.obs.cn-south-1.myhuaweicloud.com/latest/tools/openEuler20.03/PortalControl-7.0.0rc2-x86_64.tar.gz | +| openEuler20.03 | aarch64 | https://opengauss.obs.cn-south-1.myhuaweicloud.com/latest/tools/openEuler20.03/PortalControl-7.0.0rc2-aarch64.tar.gz | +| openEuler22.03 | x86_64 | https://opengauss.obs.cn-south-1.myhuaweicloud.com/latest/tools/openEuler22.03/PortalControl-7.0.0rc2-x86_64.tar.gz | +| openEuler22.03 | aarch64 | https://opengauss.obs.cn-south-1.myhuaweicloud.com/latest/tools/openEuler22.03/PortalControl-7.0.0rc2-aarch64.tar.gz | +| openEuler24.03 | x86_64 | https://opengauss.obs.cn-south-1.myhuaweicloud.com/latest/tools/openEuler24.03/PortalControl-7.0.0rc2-x86_64.tar.gz | +| openEuler24.03 | aarch64 | https://opengauss.obs.cn-south-1.myhuaweicloud.com/latest/tools/openEuler24.03/PortalControl-7.0.0rc2-aarch64.tar.gz | 1.下载gs_rep_portal安装包 ``` -wget -c https://opengauss.obs.cn-south-1.myhuaweicloud.com/latest/tools/centos7/PortalControl-7.0.0rc1-x86_64.tar.gz +wget -c https://opengauss.obs.cn-south-1.myhuaweicloud.com/latest/tools/centos7/PortalControl-7.0.0rc2-x86_64.tar.gz ``` 2.解压gs_rep_portal安装包 ``` -tar -zxvf PortalControl-7.0.0rc1-x86_64.tar.gz +tar -zxvf PortalControl-7.0.0rc2-x86_64.tar.gz ``` ## 启动方式 @@ -154,11 +154,11 @@ sh gs_rep_portal.sh help & | 工具 | 版本 | |-----------------------------|----------| -| chameleon | 7.0.0rc1 | +| chameleon | 7.0.0rc2 | | confluent | 5.5.1 | -| datacheck | 7.0.0rc1 | -| replicate-mysql2openGauss | 7.0.0rc1 | -| replicate-openGauss2mysql | 7.0.0rc1 | +| datacheck | 7.0.0rc2 | +| replicate-mysql2openGauss | 7.0.0rc2 | +| replicate-openGauss2mysql | 7.0.0rc2 | 在/ops/portal/config目录的toolspath.properties文件中修改工具安装路径,其中文件夹要以/结尾: @@ -489,13 +489,13 @@ sh gs_rep_portal.sh uninstall_mysql_all_migration_tools 1 & 1.下载gs_rep_portal安装包 ``` -wget -c https://opengauss.obs.cn-south-1.myhuaweicloud.com/latest/tools/centos7/PortalControl-7.0.0rc1-x86_64.tar.gz +wget -c https://opengauss.obs.cn-south-1.myhuaweicloud.com/latest/tools/centos7/PortalControl-7.0.0rc2-x86_64.tar.gz ``` 2.解压gs_rep_portal安装包 ``` -tar -zxvf PortalControl-7.0.0rc1-x86_64.tar.gz +tar -zxvf PortalControl-7.0.0rc2-x86_64.tar.gz ``` 3.在/ops/portal/config目录的toolspath.properties文件中修改安装路径,然后启动命令安装 diff --git a/pom.xml b/pom.xml index 0832064d3ea64925e45f11952c7b760a49a19173..41b5ec592bbda05462d4624653ba4d3fb2c0910e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.opengauss portalControl - 7.0.0rc1 + 7.0.0rc2 org.springframework.boot diff --git a/portal/config/toolspath.properties b/portal/config/toolspath.properties index 4cc5b82d57d1ff76b38b5f85ab3267f9b64ba6cc..00217f7496ed1c584f4ccded36d1234fa2c2c6ce 100644 --- a/portal/config/toolspath.properties +++ b/portal/config/toolspath.properties @@ -1,4 +1,4 @@ -tools.version=7.0.0rc1 +tools.version=7.0.0rc2 system.name=centos7 system.arch=x86_64 diff --git a/portal/shell/gs_datacheck.sh b/portal/shell/gs_datacheck.sh index ad9816f790fb97a2e4a360c55990dffa8d5088a4..5d41440f353e7dc97c021fc21907f2a71b1ed0f5 100644 --- a/portal/shell/gs_datacheck.sh +++ b/portal/shell/gs_datacheck.sh @@ -1,5 +1,5 @@ #!/bin/bash -APP_NAME=portalControl-7.0.0rc1-exec.jar +APP_NAME=portalControl-7.0.0rc2-exec.jar #根据参数决定校验模式 case "$2" in diff --git a/portal/shell/gs_mysync.sh b/portal/shell/gs_mysync.sh index 91f5537d68f837e7ca816e24d496728d721af7e6..e60263fe8c234d653cc9954ab83cf44979eac42a 100644 --- a/portal/shell/gs_mysync.sh +++ b/portal/shell/gs_mysync.sh @@ -1,5 +1,5 @@ #!/bin/bash -APP_NAME=portalControl-7.0.0rc1-exec.jar +APP_NAME=portalControl-7.0.0rc2-exec.jar START_ORDER=start_mysql_full_migration STOP_ORDER=stop_plan INSTALL_ORDER=install_mysql_full_migration_tools diff --git a/portal/shell/gs_rep_portal.sh b/portal/shell/gs_rep_portal.sh index 89f20473f24d81a4a497ac3d479c41aa4917ffde..30d206cf076b8a9257ff5c9cc132b04f3a00ec77 100644 --- a/portal/shell/gs_rep_portal.sh +++ b/portal/shell/gs_rep_portal.sh @@ -1,5 +1,5 @@ #!/bin/bash -APP_NAME=portalControl-7.0.0rc1-exec.jar +APP_NAME=portalControl-7.0.0rc2-exec.jar ORDER=$1 SIGN="workspace.id=1" ID=1 diff --git a/portal/shell/gs_replicate.sh b/portal/shell/gs_replicate.sh index 7770407bbcc17796b6e4e0550ab643ea9194756d..4ef08057ff3be3e2a20dc6f08f63448a6868abda 100644 --- a/portal/shell/gs_replicate.sh +++ b/portal/shell/gs_replicate.sh @@ -1,5 +1,5 @@ #!/bin/bash -APP_NAME=portalControl-7.0.0rc1-exec.jar +APP_NAME=portalControl-7.0.0rc2-exec.jar #根据参数决定迁移模式 case "$2" in diff --git "a/portal\344\270\216datakit\347\232\204\344\272\244\344\272\222\346\226\271\345\274\2171.md" "b/portal\344\270\216datakit\347\232\204\344\272\244\344\272\222\346\226\271\345\274\2171.md" index 769ff47d74086106e1a496da15ce7597f90d3a9c..e79e47faa90a128690b3050489daf3d736b5b5a8 100644 --- "a/portal\344\270\216datakit\347\232\204\344\272\244\344\272\222\346\226\271\345\274\2171.md" +++ "b/portal\344\270\216datakit\347\232\204\344\272\244\344\272\222\346\226\271\345\274\2171.md" @@ -2,7 +2,7 @@ 1. 安装部分: - Datakit在安装完portal之后,先配置portal_home/config/toolspath.properties中各迁移工具的位置,通过调用java -Dorder=install_mysql_all_migration_tools -Dskip=true -jar portalControl-7.0.0rc1-exec.jar安装全部迁移工具。 + Datakit在安装完portal之后,先配置portal_home/config/toolspath.properties中各迁移工具的位置,通过调用java -Dorder=install_mysql_all_migration_tools -Dskip=true -jar portalControl-7.0.0rc2-exec.jar安装全部迁移工具。 toolspath.properties需要配置的路径: @@ -29,7 +29,7 @@ datakit通过-Dparameter=value的形式将参数传给portal(这里需要全部参数文档) - 比如java -Dparameter=value -jar portalControl-7.0.0rc1-exec.jar + 比如java -Dparameter=value -jar portalControl-7.0.0rc2-exec.jar 迁移进度获取: @@ -44,7 +44,7 @@ 3. 交互方式: - java -Dworkspace.id=1 -Dorder=start_plan3 -Dskip=true -jar portalControl-7.0.0rc1-exec.jar + java -Dworkspace.id=1 -Dorder=start_plan3 -Dskip=true -jar portalControl-7.0.0rc2-exec.jar | 指令 | 说明 | | ----------- | ------------------------------------------------------------ | @@ -53,7 +53,7 @@ 如果执行在线迁移,那么直接启动plan3即可,如果想要追加操作,比如停止增量迁移,就需要另起一个进程向之前的进程传递信号。 - java -Dworkspace.id=1 -Dorder=stop_incremental_migration -Dskip=true -jar portalControl-7.0.0rc1-exec.jar + java -Dworkspace.id=1 -Dorder=stop_incremental_migration -Dskip=true -jar portalControl-7.0.0rc2-exec.jar 以上命令代表停止workspaceid为1的任务的增量迁移指令。 diff --git a/src/main/java/org/opengauss/portalcontroller/constant/Parameter.java b/src/main/java/org/opengauss/portalcontroller/constant/Parameter.java index 8dbaa3e9dd073d9c98854733b6bc0f494d169266..1cd0cc18e2cf92a83ab7d01fcca210d7d7434b6e 100644 --- a/src/main/java/org/opengauss/portalcontroller/constant/Parameter.java +++ b/src/main/java/org/opengauss/portalcontroller/constant/Parameter.java @@ -56,7 +56,7 @@ public interface Parameter { /** * The constant PORTAL_NAME. */ - String PORTAL_NAME = "portalControl-7.0.0rc1-exec.jar"; + String PORTAL_NAME = "portalControl-7.0.0rc2-exec.jar"; /** * The constant INSTALL_ALL_MIGRATION_TOOLS.