You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by zh...@apache.org on 2022/07/21 03:38:10 UTC
[rocketmq] branch develop updated: [ISSUE #4646] Document modification of rocketmq 5.0 automatic master-slave switching (#4645)
This is an automated email from the ASF dual-hosted git repository.
zhoubo pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
The following commit(s) were added to refs/heads/develop by this push:
new 8ccffa7e8 [ISSUE #4646] Document modification of rocketmq 5.0 automatic master-slave switching (#4645)
8ccffa7e8 is described below
commit 8ccffa7e8ad3fcc30c3390591118b86b0f5be897
Author: rongtong <ji...@163.com>
AuthorDate: Thu Jul 21 11:38:02 2022 +0800
[ISSUE #4646] Document modification of rocketmq 5.0 automatic master-slave switching (#4645)
* Document modification of rocketmq 5.0 automatic master-slave switching mode
* Polish the document of controller
---
docs/cn/Deployment.md | 14 +++++++++++++-
docs/cn/controller/deploy.md | 4 +++-
docs/cn/controller/quick_start.md | 4 +---
.../cn/image/controller/quick-start/controller.png | Bin 315128 -> 268136 bytes
docs/cn/operation.md | 10 ++++++++++
5 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/docs/cn/Deployment.md b/docs/cn/Deployment.md
index 711bb189d..5224e7eab 100644
--- a/docs/cn/Deployment.md
+++ b/docs/cn/Deployment.md
@@ -156,4 +156,16 @@ $ nohup sh mqbroker -n 192.168.1.1:9876 -c $ROCKETMQ_HOME/conf/2m-2s-sync/broker
$ nohup sh mqbroker -n 192.168.1.1:9876 -c $ROCKETMQ_HOME/conf/2m-2s-sync/broker-b-s.properties &
```
-上述Master和Slave是通过指定相同的config命名为“brokerName”来配对的，master节点的brokerId必须为0，slave节点的brokerId必须大于0。
\ No newline at end of file
+上述Master和Slave是通过指定相同的config命名为“brokerName”来配对的，master节点的brokerId必须为0，slave节点的brokerId必须大于0。
+
+### 5 RocketMQ 5.0 自动主从切换
+
+RocketMQ 5.0 开始支持自动主从切换的模式，可参考以下文档
+
+[快速开始](controller/quick_start.md)
+
+[部署文档](controller/deploy.md)
+
+[设计思想](controller/design.md)
+
+
diff --git a/docs/cn/controller/deploy.md b/docs/cn/controller/deploy.md
index 63c8a5698..4d8af5ee8 100644
--- a/docs/cn/controller/deploy.md
+++ b/docs/cn/controller/deploy.md
@@ -34,6 +34,8 @@ notifyBrokerRoleChanged = true
其他一些参数可以参考ControllerConfig代码。
+参数设置完成后，指定配置文件启动Nameserver即可。
+
### 独立部署
独立部署执行以下脚本即可
@@ -58,7 +60,7 @@ Broker启动方法与之前相同，增加以下参数
- syncFromLastFile：若slave是空盘启动，是否从最后一个文件进行复制。默认为false。
- asyncLearner：若该值为true，则该副本不会进入SyncStateSet，也就是不会被选举成Master，而是一直作为一个learner副本进行异步复制。默认为false。
-在Controller模式下，Broker配置必须设置enableControllerMode=true，并填写controllerAddr。若controller为独立部署，还需要将controllerDeployedStandAlone设置为true。
+在Controller模式下，Broker配置必须设置enableControllerMode=true，并填写controllerAddr。
## 兼容性
diff --git a/docs/cn/controller/quick_start.md b/docs/cn/controller/quick_start.md
index 8b5ee9626..8f8af190d 100644
--- a/docs/cn/controller/quick_start.md
+++ b/docs/cn/controller/quick_start.md
@@ -2,7 +2,7 @@
## 前言
-该文档主要介绍如何快速构建和部署基于 Controller 的可以自动切换的 RocketMQ 集群。
+该文档主要介绍如何快速构建自动主从切换的 RocketMQ 集群。
详细的新集群部署和旧集群升级指南请参考 [部署指南](deploy.md)。
@@ -12,8 +12,6 @@
`cd rocketmq`
-`git checkout -b controller_mode origin/5.0.0-beta-dledger-controller `
-
` mvn -Prelease-all -DskipTests clean install -U`
## 快速部署
diff --git a/docs/cn/image/controller/quick-start/controller.png b/docs/cn/image/controller/quick-start/controller.png
index 9a4b69f38..d7ffed6b8 100644
Binary files a/docs/cn/image/controller/quick-start/controller.png and b/docs/cn/image/controller/quick-start/controller.png differ
diff --git a/docs/cn/operation.md b/docs/cn/operation.md
index 737fd2527..f36936c35 100644
--- a/docs/cn/operation.md
+++ b/docs/cn/operation.md
@@ -137,6 +137,16 @@ $ nohup sh mqbroker -n 192.168.1.1:9876 -c $ROCKETMQ_HOME/conf/2m-2s-sync/broker
以上Broker与Slave配对是通过指定相同的BrokerName参数来配对，Master的BrokerId必须是0，Slave的BrokerId必须是大于0的数。另外一个Master下面可以挂载多个Slave，同一Master下的多个Slave通过指定不同的BrokerId来区分。$ROCKETMQ_HOME指的RocketMQ安装目录，需要用户自己设置此环境变量。
+#### 1.5 RocketMQ 5.0 自动主从切换
+
+RocketMQ 5.0 开始支持自动主从切换的模式，可参考以下文档
+
+[快速开始](controller/quick_start.md)
+
+[部署文档](controller/deploy.md)
+
+[设计思想](controller/design.md)
+
### 2 mqadmin管理工具
> 注意：