This is an automated email from the ASF dual-hosted git repository.
dinglei 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 ea3298065c Polish the persistent_unique_broker_id document (#6817)
ea3298065c is described below
commit ea3298065c22f8e4c1e1ce34e4baadd6b238b5d5
Author: rongtong <[email protected]>
AuthorDate: Fri May 26 21:51:24 2023 +0800
Polish the persistent_unique_broker_id document (#6817)
---
docs/cn/controller/persistent_unique_broker_id.md | 12 ++++++------
docs/en/controller/persistent_unique_broker_id.md | 10 +++++-----
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/docs/cn/controller/persistent_unique_broker_id.md
b/docs/cn/controller/persistent_unique_broker_id.md
index 79adb41616..1d7a289fb7 100644
--- a/docs/cn/controller/persistent_unique_broker_id.md
+++ b/docs/cn/controller/persistent_unique_broker_id.md
@@ -105,8 +105,8 @@ Controller侧在更新完`BrokerAddress`之后可携带着当前该Broker所在
## 升级方案
-4.x版本升级遵守5.0升级文档流程即可。
-5.x非持久化BrokerId版本升级到持久化BrokerId版本按照如下流程:
+4.x 版本升级遵守 5.0 升级文档流程即可。
+5.0.0 和 5.1.0 非持久化BrokerId版本升级到 5.1.1 及以上持久化BrokerId版本按照如下流程:
### 升级Controller
@@ -129,7 +129,7 @@ Controller侧在更新完`BrokerAddress`之后可携带着当前该Broker所在
### 兼容性
-| | 5.0旧Controller | 新Controller |
-| --- | --- | --- |
-| 5.0旧Broker | 正常运行，可切换 | 若已主备确定则可正常运行，不可切换。若broker重新启动则无法上线 |
-| 新Broker | 无法正常上线 | 正常运行，可切换 |
+| | 5.1.0 及以下版本 Controller | 5.1.1 及以上版本 Controller
|
+|--------------------|------------------------|------------------------------------|
+| 5.1.0 及以下版本 Broker | 正常运行，可切换 |
若已主备确定则可正常运行，不可切换。若broker重新启动则无法上线 |
+| 5.1.1 及以上版本 Broker | 无法正常上线 | 正常运行，可切换
|
diff --git a/docs/en/controller/persistent_unique_broker_id.md
b/docs/en/controller/persistent_unique_broker_id.md
index 99861ebfd2..cd07657854 100644
--- a/docs/en/controller/persistent_unique_broker_id.md
+++ b/docs/en/controller/persistent_unique_broker_id.md
@@ -101,7 +101,7 @@ After successful registration, all subsequent requests and
state records for the
## Upgrade plan
To upgrade to version 4.x, follow the 5.0 upgrade documentation process.
-For upgrading from the non-persistent BrokerId version in 5.x to the
persistent BrokerId version, follow the following steps:
+For upgrading from the non-persistent BrokerId version in 5.0.0 or 5.1.0 to
the persistent BrokerId version 5.1.1 or above, follow the following steps:
### Upgrade Controller
@@ -123,7 +123,7 @@ For upgrading from the non-persistent BrokerId version in
5.x to the persistent
### Compatibility
-| | old Controller | new Controller
|
-| -------------- | ------------------------------ |
------------------------------------------------------------ |
-| 5.0 old Broker | Normal operation and switch. | Normal operation and no
switch if the master-slave relationship is already determined. The Broker
cannot be brought up if it is restarted. |
-| New Broker | Cannot be brought up normally. | Normal operation and
switch. |
\ No newline at end of file
+| | Controller for version 5.1.0 and below
| Controller for version 5.1.1 and above
|
+|------------------------------------|--------------------------------|
------------------------------------------------------------ |
+| Broker for version 5.1.0 and below | Normal operation and switch. | Normal
operation and no switch if the master-slave relationship is already determined.
The Broker cannot be brought up if it is restarted. |
+| Broker for version 5.1.1 and above | Cannot be brought up normally. | Normal
operation and switch. |
\ No newline at end of file
