Skip to content

Conversation

RongtongJin
Copy link
Contributor

Make sure set the target branch to develop

What is the purpose of the change

Polish the logic of change to master

broker和controller网络分区恢复时,有可能新选的master仍然时以前的,则changeToMaster时可以避免一些操作

Brief changelog

Polish the logic of change to master

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.

  • Make sure there is a Github issue filed for the change (usually before you start working on it). Trivial changes like typos do not require a Github issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
  • Format the pull request title like [ISSUE #123] Fix UnknownException when host config not exist. Each commit in the pull request should have a meaningful subject line and body.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Write necessary unit-test(over 80% coverage) to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in test module.
  • Run mvn -B clean apache-rat:check findbugs:findbugs checkstyle:checkstyle to make sure basic checks pass. Run mvn clean install -DskipITs to make sure unit-test pass. Run mvn clean test-compile failsafe:integration-test to make sure integration-test pass.
  • If this contribution is large, please file an Apache Individual Contributor License Agreement.

Copy link
Member

@hzh0425 hzh0425 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@codecov-commenter
Copy link

codecov-commenter commented Jun 15, 2022

Codecov Report

Merging #4464 (878fde6) into 5.0.0-beta-dledger-controller (d9273e7) will increase coverage by 0.06%.
The diff coverage is 0.00%.

@@                         Coverage Diff                         @@
##             5.0.0-beta-dledger-controller    #4464      +/-   ##
===================================================================
+ Coverage                            43.22%   43.28%   +0.06%     
- Complexity                            6358     6371      +13     
===================================================================
  Files                                  841      841              
  Lines                                59860    59862       +2     
  Branches                              8159     8160       +1     
===================================================================
+ Hits                                 25873    25912      +39     
+ Misses                               30632    30599      -33     
+ Partials                              3355     3351       -4     
Impacted Files Coverage Δ
.../rocketmq/broker/hacontroller/ReplicasManager.java 0.00% <0.00%> (ø)
...cketmq/broker/processor/PopBufferMergeService.java 40.47% <0.00%> (-0.24%) ⬇️
...ent/impl/consumer/DefaultLitePullConsumerImpl.java 68.43% <0.00%> (+0.17%) ⬆️
.../apache/rocketmq/logging/inner/LoggingBuilder.java 64.71% <0.00%> (+0.31%) ⬆️
...cketmq/store/ha/autoswitch/AutoSwitchHAClient.java 75.84% <0.00%> (+0.37%) ⬆️
...he/rocketmq/client/trace/AsyncTraceDispatcher.java 77.72% <0.00%> (+0.49%) ⬆️
.../org/apache/rocketmq/store/ha/DefaultHAClient.java 58.97% <0.00%> (+0.51%) ⬆️
...rocketmq/broker/processor/PopMessageProcessor.java 39.57% <0.00%> (+0.53%) ⬆️
...rocketmq/client/impl/factory/MQClientInstance.java 47.02% <0.00%> (+1.38%) ⬆️
...mq/store/ha/autoswitch/AutoSwitchHAConnection.java 75.13% <0.00%> (+1.62%) ⬆️
... and 4 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d9273e7...878fde6. Read the comment docs.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.02%) to 47.474% when pulling 878fde6 on RongtongJin:5.0.0-beta-dledger-controller-5 into d9273e7 on apache:5.0.0-beta-dledger-controller.

@odbozhou odbozhou merged commit fd804d9 into apache:5.0.0-beta-dledger-controller Jun 15, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants