Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ISSUE #6163] Fix the issue of infinite retry of order message #6164

Merged
merged 1 commit into from
Feb 23, 2023

Conversation

RongtongJin
Copy link
Contributor

@RongtongJin RongtongJin commented Feb 23, 2023

Make sure set the target branch to develop

What is the purpose of the change

fix #6163

Brief changelog

  1. Client modification
    When order message is sent back to the broker, the number of retries is forced to be+1 to ensure the logic of entering the dead letter queue.

  2. Broker modification
    Add condition judgment. If it is a order message, enter the logic of delivering dead letter queue

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.

@codecov-commenter
Copy link

Codecov Report

Merging #6164 (da7345d) into develop (0ec8c92) will decrease coverage by 0.03%.
The diff coverage is 0.00%.

@@              Coverage Diff              @@
##             develop    #6164      +/-   ##
=============================================
- Coverage      43.22%   43.20%   -0.03%     
- Complexity      8855     8857       +2     
=============================================
  Files           1094     1094              
  Lines          77147    77152       +5     
  Branches       10063    10064       +1     
=============================================
- Hits           33347    33333      -14     
- Misses         39637    39657      +20     
+ Partials        4163     4162       -1     
Impacted Files Coverage Δ
...ocketmq/broker/processor/SendMessageProcessor.java 36.38% <0.00%> (-0.50%) ⬇️
...nt/impl/consumer/ConsumeMessageOrderlyService.java 50.17% <0.00%> (ø)
...a/org/apache/rocketmq/broker/BrokerController.java 43.14% <0.00%> (-2.86%) ⬇️
...rocketmq/common/message/MessageClientIDSetter.java 71.42% <0.00%> (-2.39%) ⬇️
...pl/consumer/ConsumeMessageConcurrentlyService.java 47.05% <0.00%> (-2.27%) ⬇️
...va/org/apache/rocketmq/store/util/PerfCounter.java 64.39% <0.00%> (-2.10%) ⬇️
...e/rocketmq/store/ha/autoswitch/EpochFileCache.java 77.08% <0.00%> (-1.39%) ⬇️
...he/rocketmq/client/impl/consumer/ProcessQueue.java 60.79% <0.00%> (-1.33%) ⬇️
...a/org/apache/rocketmq/store/StoreStatsService.java 34.53% <0.00%> (-0.56%) ⬇️
...apache/rocketmq/store/queue/BatchConsumeQueue.java 70.21% <0.00%> (-0.55%) ⬇️
... and 13 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

Copy link
Member

@mxsm mxsm left a comment

Choose a reason for hiding this comment

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

LGTM~

@odbozhou odbozhou merged commit 7cfffe7 into apache:develop Feb 23, 2023
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.

After setMaxReconsumeTimes is set, the order consumer will retry indefinitely
8 participants