Skip to content

Conversation

cserwen
Copy link
Member

@cserwen cserwen commented Apr 2, 2022

Make sure set the target branch to develop

What is the purpose of the change

Issue #3798

Brief changelog

XX

Verifying this change

image

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.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.05%) to 47.168% when pulling 991182d on cserwen:container-dledger into 52482d4 on apache:5.0.0-beta.

@coveralls
Copy link

coveralls commented Apr 2, 2022

Coverage Status

Coverage decreased (-0.04%) to 47.185% when pulling 4da0c78 on cserwen:container-dledger into 52482d4 on apache:5.0.0-beta.

@codecov-commenter
Copy link

codecov-commenter commented Apr 2, 2022

Codecov Report

Merging #4100 (4da0c78) into 5.0.0-beta (52482d4) will decrease coverage by 0.00%.
The diff coverage is 42.18%.

@@               Coverage Diff                @@
##             5.0.0-beta    #4100      +/-   ##
================================================
- Coverage         43.09%   43.09%   -0.01%     
- Complexity         6014     6026      +12     
================================================
  Files               795      795              
  Lines             56825    56859      +34     
  Branches           7780     7787       +7     
================================================
+ Hits              24491    24504      +13     
- Misses            29142    29169      +27     
+ Partials           3192     3186       -6     
Impacted Files Coverage Δ
...e/rocketmq/container/BrokerContainerProcessor.java 4.19% <0.00%> (-0.09%) ⬇️
...he/rocketmq/tools/admin/DefaultMQAdminExtImpl.java 24.96% <0.00%> (ø)
...ools/command/container/RemoveBrokerSubCommand.java 0.00% <0.00%> (ø)
...org/apache/rocketmq/container/BrokerContainer.java 55.39% <57.14%> (+0.45%) ⬆️
...q/container/logback/BrokerLogbackConfigurator.java 68.42% <87.50%> (ø)
...a/org/apache/rocketmq/broker/BrokerController.java 51.13% <0.00%> (-4.15%) ⬇️
...che/rocketmq/acl/plain/PlainPermissionManager.java 75.19% <0.00%> (-0.52%) ⬇️
.../org/apache/rocketmq/store/ha/DefaultHAClient.java 59.48% <0.00%> (+0.51%) ⬆️
...rocketmq/broker/processor/PopMessageProcessor.java 39.64% <0.00%> (+0.53%) ⬆️
...ent/impl/consumer/DefaultLitePullConsumerImpl.java 68.43% <0.00%> (+0.68%) ⬆️
... 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 52482d4...4da0c78. Read the comment docs.

@cserwen
Copy link
Member Author

cserwen commented Apr 7, 2022

@RongtongJin Hi, can you help me to review this pr?

Copy link
Contributor

@RongtongJin RongtongJin left a comment

Choose a reason for hiding this comment

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

It seems that removeBroker didn't do anything for dledger? In addition, maybe we need to modify admin(addBroker, removeBroker) comments or functions synchronously.

if (previousBroker == null) {
// New master broker added, start it
try {
BrokerLogbackConfigurator.doConfigure(brokerConfig);
Copy link
Contributor

Choose a reason for hiding this comment

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

The log will be separated by BrokerClusterName_ BrokerName_BrokerId, but the brokerId will change in the dledger mode. There may be a problem here.

Copy link
Member Author

Choose a reason for hiding this comment

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

The log will be separated by BrokerClusterName_ BrokerName_BrokerId, but the brokerId will change in the dledger mode. There may be a problem here.

@RongtongJin Yes, you are right! I think that we can use BrokerIdentity to replace it in doConfigure, so that we can use dLedgerId to replace brokerId.

@cserwen
Copy link
Member Author

cserwen commented Apr 8, 2022

It seems that removeBroker didn't do anything for dledger? In addition, maybe we need to modify admin(addBroker, removeBroker) comments or functions synchronously.

@RongtongJin Thanks for the reminder, I forgot to add it in this method.

@cserwen cserwen force-pushed the container-dledger branch 4 times, most recently from a99a2bc to e5bef12 Compare April 8, 2022 09:40
@cserwen cserwen force-pushed the container-dledger branch from e5bef12 to 4da0c78 Compare April 8, 2022 10:09
@RongtongJin
Copy link
Contributor

LGTM~

@RongtongJin RongtongJin merged commit bb9d6e6 into apache:5.0.0-beta Apr 9, 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.

4 participants