[ISSUE #5989] Support unique broker-id as identification in controller mode #6100
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
TheR1sing3un
changed the title
TheR1sing3un
changed the title
mxsm
reviewed
Feb 21, 2023
broker/src/main/java/org/apache/rocketmq/broker/controller/ReplicasManager.java
Outdated
Show resolved
Hide resolved
broker/src/main/java/org/apache/rocketmq/broker/controller/ReplicasManager.java
Outdated
Show resolved
Hide resolved
store/src/main/java/org/apache/rocketmq/store/ha/autoswitch/TempBrokerMetadata.java
Outdated
Show resolved
Hide resolved
broker/src/main/java/org/apache/rocketmq/broker/controller/ReplicasManager.java
Show resolved
Hide resolved
broker/src/main/java/org/apache/rocketmq/broker/controller/ReplicasManager.java
Outdated
Show resolved
Hide resolved
RongtongJin
reviewed
Feb 22, 2023
.../java/org/apache/rocketmq/remoting/protocol/header/namesrv/BrokerHeartbeatRequestHeader.java
Outdated
Show resolved
Hide resolved
broker/src/main/java/org/apache/rocketmq/broker/controller/ReplicasManager.java
Outdated
Show resolved
Hide resolved
controller/src/main/java/org/apache/rocketmq/controller/impl/manager/BrokerReplicaInfo.java
Outdated
Show resolved
Hide resolved
remoting/src/main/java/org/apache/rocketmq/remoting/protocol/RequestCode.java
Outdated
Show resolved
Hide resolved
tools/src/main/java/org/apache/rocketmq/tools/command/controller/ReElectMasterSubCommand.java
Show resolved
Hide resolved
@TheR1sing3un 后续可以更新一下https://github.com/apache/rocketmq/tree/develop/docs/cn/controller 下面的对应文档(中英文) |
Codecov Report
@@ Coverage Diff @@
## develop #6100 +/- ##
=============================================
- Coverage 43.14% 43.02% -0.13%
- Complexity 8860 8889 +29
=============================================
Files 1094 1103 +9
Lines 77284 77718 +434
Branches 10085 10115 +30
=============================================
+ Hits 33347 33437 +90
- Misses 39771 40091 +320
- Partials 4166 4190 +24
... and 16 files with indirect coverage changes 📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
RongtongJin
changed the base branch from
develop
to
dledger-controller-brokerId
RongtongJin
changed the base branch from
dledger-controller-brokerId
to
develop
RongtongJin
reviewed
Mar 6, 2023
...oller/src/main/java/org/apache/rocketmq/controller/processor/ControllerRequestProcessor.java
Show resolved
Hide resolved
store/src/main/java/org/apache/rocketmq/store/config/MessageStoreConfig.java
Outdated
Show resolved
Hide resolved
RongtongJin
reviewed
Mar 6, 2023
broker/src/main/java/org/apache/rocketmq/broker/controller/ReplicasManager.java
Outdated
Show resolved
Hide resolved
升级方案升级方案5.0以下版本升级则遵守之前的升级步骤。 升级controller由于我们在controller里面更改了许多状态机的内部属性以及新版的brokerId分配的逻辑，因此controller需要进行升级。
升级Broker
测试
nohup sh bin/mqnamesrv &
nohup sh bin/mqcontroller -c ./conf/controller/controller-standalone.conf &
sh bin/mqadmin getControllerMetaData -a localhost:9878
nohup sh bin/mqbroker -c conf/controller/quick-start/broker-n0.conf &nohup sh bin/mqbroker -c conf/controller/quick-start/broker-n1.conf &
sh bin/mqadmin getSyncStateSet -a localhost:9878 -b broker-a
sh bin/mqadmin sendMessage -p "hello" -n localhost:9876 -b broker-a -t default
sh bin/mqadmin getBrokerEpoch -n localhost:9876 -b broker-a
将controller进程杀死。
兼容性
|
RongtongJin
reviewed
Mar 7, 2023
broker/src/main/java/org/apache/rocketmq/broker/controller/ReplicasManager.java
Outdated
Show resolved
Hide resolved
RongtongJin
reviewed
Mar 9, 2023
Comment on lines
181
to
193
| for (int retryTimes = 0; retryTimes < 5; retryTimes++) { | ||
| if (register()) { | ||
| LOGGER.info("First time register broker success"); | ||
| this.state = State.REGISTER_TO_CONTROLLER_DONE; | ||
| break; | ||
| } | ||
| } |
There was a problem hiding this comment.
这边是不是不需要连续重试，如果失败直接等待再次重跑startBasicService
RongtongJin
reviewed
Mar 10, 2023
controller/src/main/java/org/apache/rocketmq/controller/impl/manager/ReplicasInfoManager.java
Show resolved
Hide resolved
controller/src/main/java/org/apache/rocketmq/controller/impl/manager/ReplicasInfoManager.java
Outdated
Show resolved
Hide resolved
|
|
RongtongJin
reviewed
Mar 12, 2023
Comment on lines
+140
to
+164
| ### 持久化BrokerID版本的升级注意事项 | ||
|
|
||
| 目前版本支持采用了新的持久化BrokerID版本的高可用架构，从该版本前的5.x升级到当前版本需要注意如下事项。 | ||
|
|
||
| 4.x版本升级遵守上述流程即可。 | ||
| 5.x非持久化BrokerID版本升级到持久化BrokerID版本按照如下流程: | ||
|
|
||
| **升级Controller** | ||
|
|
||
| 1. 将旧版本Controller组停机。 | ||
| 2. 清除Controller数据，即默认在`~/DLedgerController`下的数据文件。 | ||
| 3. 上线新版Controller组。 | ||
|
|
||
| > 在上述升级Controller流程中，Broker仍可正常运行，但无法切换。 | ||
|
|
||
| **升级Broker** | ||
|
|
||
| 1. 将Broker从节点停机。 | ||
| 2. 将Broker主节点停机。 | ||
| 3. 将所有的Broker的Epoch文件删除，即默认为`~/store/epochFileCheckpoint`和`~/store/epochFileCheckpoint.bak`。 | ||
| 4. 将原先的主Broker先上线，等待该Broker当选为master。(可使用`admin`命令的`getSyncStateSet`来观察) | ||
| 5. 将原来的从Broker全部上线。 | ||
|
|
||
| > 建议停机时先停从再停主，上线时先上原先的主再上原先的从，这样可以保证原来的主备关系。 | ||
| > 若需要改变升级前后主备关系，则需要停机时保证主、备的CommitLog对齐，否则可能导致数据被截断而丢失。 |
There was a problem hiding this comment.
建议单独搞一个文档，介绍brokerId持久化方案的背景（解决的问题）、设计思想、兼容性升级方案，然后在部署文档中用链接引过去
RongtongJin
force-pushed
the
fix_forget_send_heartbeat
branch
from
6238611
to
77745b4
Compare
…ller mode (apache#5046) * refactor(controller): refactor the register logic 1. refactor the register logic * refactor(controller): remove unused field in ElectMasterEvent 1. remove unused field in ElectMasterEvent * feat(controller): add a tryElectMaster request and process logic about it 1. add a tryElectMaster request and process logic about it * feat(controller): refactor ReplicasInfoManagerTest 1. refactor ReplicasInfoManagerTest * refactor(controller): refactor DLedgerControllerTest 1. refactor DLedgerControllerTest * refactor(controller): refactor ControllerManagerTest 1. refactor ControllerManagerTest * refactor(controller): refactor ReplicasInfoManagerTest 1. refactor ReplicasInfoManagerTest * refactor(controller): refactor register process and pass the junit test 1. refactor ReplicasInfoManagerTest * style(broker): rename a constant 1. rename a constant * feat(controller): update the DLedger dependency from v0.27 to v0.30 1. update the DLedger dependency from v0.27 to v0.30 * style(controller): add a white-line just for trigger GitHub action again 1. add a white-line just for trigger GitHub action again * feat(controller): combine electMaster api and brokerTryElectMaster api 1. combine electMaster api and brokerTryElectMaster api * feat(controller): add a logic about verifying the broker id returned from registering 1. add a logic about verifying the broker id returned from registering * fix(controller): remove unused code and add a warning log in ControllerManager 1. remove unused code and add a warning log in ControllerManager * fix: resolve conflicts 1. resolve conflicts * fix(controller): remove unused class 1. remove unused class * fix(controller): Resolve conflicts after merging 1. Resolve conflicts after merging * refactor(controller): Refactor ReplicasInfoManager#elect 1. Refactor ReplicasInfoManager#elect * style(controller): remove unused imports 1. remove unused imports * style(controller): remove unused imports 1. remove unused imports * fix(controller): resolve conflicts after merging develop branch 1. resolve conflicts after merging develop branch * rerun * fix(controller): resolve conflicts in ReplicasInfoManagerTest#testRegisterNewBroker after merging develop branch 1. resolve conflicts in ReplicasInfoManagerTest#testRegisterNewBroker after merging develop branch * style(controller): pass style check 1. pass style check
…p address to broker id 1. refactor broker's information recording core from ip address to broker id
1. add protocols about new register flow
1. refactor code in module: store/ha for persistence broker-id
1. implement the general register to controller protocol
1. add docs about how to update to BrokerId version
…g#storePathTempMetadata` 1. remove meaningless attribute `MessageStoreConfig#storePathTempMetadata`
1. check metadata if valid when register
… to name server 1. set isolate's value to false to normally register broker to name server
1. Random sleep within one second when broker register failed
1. rename registerSuccess to registerBrokerToController
…ig back to default value 1. fix forgetting set the changed cluster name broker config back to default value
1. add more logs when broker register to controller
1. fix wrong log
1. fix wrong test
1. fix incompatible command: CleanBrokerMeta
1. fix forgetting initialize BrokerHeartbeatManager
…nagerRegisterTest 1. add more logs when register and refactor ReplicasManagerRegisterTest
1. optimize some test base store path
1. fix conflicts after rebase
1. fix conflicts in test after rebase
TheR1sing3un
force-pushed
the
fix_forget_send_heartbeat
branch
from
77745b4
to
b2c7421
Compare
…id the controller to notify the brokers when their roles have been changed. 1. To pass `ControllerManagerTest` in Windows, we forbid the controller to notify the brokers when their roles have been changed.
RongtongJin
approved these changes
Mar 14, 2023
|
Rebase and merge this PR because its commit log is clear and huge. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Make sure set the target branch to
developWhat is the purpose of the change
fix #5989
Brief changelog
XX
Verifying this change
XXXX
Follow this checklist to help us incorporate your contribution quickly and easily. Notice,
it would be helpful if you could finish the following 5 checklist(the last one is not necessary)before request the community to review your PR.[ISSUE #123] Fix UnknownException when host config not exist. Each commit in the pull request should have a meaningful subject line and body.mvn -B clean apache-rat:check findbugs:findbugs checkstyle:checkstyleto make sure basic checks pass. Runmvn clean install -DskipITsto make sure unit-test pass. Runmvn clean test-compile failsafe:integration-testto make sure integration-test pass.