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 #5983] Make consumer support flow control code better #5984

Merged
merged 2 commits into from Feb 6, 2023

Conversation

RongtongJin
Copy link
Contributor

Make sure set the target branch to develop

What is the purpose of the change

Close #5983
When the current pushConsumer encounters flow control code, it will be considered as a general exception. It will stop pulling after 3s, which leads to inaccurate consumption limit. I suggest aligning with gRPC push consumer and stopping pulling after 20ms.

Brief changelog

When encountering the flow control code, pull it after 20ms instead of 3s.

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.

@RongtongJin
Copy link
Contributor Author

@Focus-rth PTAL~

@RongtongJin RongtongJin changed the title [ISSUE #5983] Make pushConsumer support flow control code better [ISSUE #5983] Make consumer support flow control code better Feb 4, 2023
@codecov-commenter
Copy link

codecov-commenter commented Feb 4, 2023

Codecov Report

Merging #5984 (8618aaa) into develop (6268605) will increase coverage by 0.00%.
The diff coverage is 23.52%.

@@            Coverage Diff             @@
##             develop    #5984   +/-   ##
==========================================
  Coverage      43.39%   43.40%           
- Complexity      8829     8830    +1     
==========================================
  Files           1090     1090           
  Lines          76609    76615    +6     
  Branches       10003    10006    +3     
==========================================
+ Hits           33244    33253    +9     
  Misses         39209    39209           
+ Partials        4156     4153    -3     
Impacted Files Coverage Δ
...lient/impl/consumer/DefaultMQPushConsumerImpl.java 31.92% <0.00%> (-0.17%) ⬇️
...ent/impl/consumer/DefaultLitePullConsumerImpl.java 67.91% <57.14%> (-1.00%) ⬇️
...apache/rocketmq/broker/longpolling/PopRequest.java 31.03% <0.00%> (-13.80%) ⬇️
...a/org/apache/rocketmq/filter/util/BloomFilter.java 60.43% <0.00%> (-2.20%) ⬇️
...cketmq/broker/schedule/ScheduleMessageService.java 56.91% <0.00%> (-1.14%) ⬇️
...mq/client/impl/producer/DefaultMQProducerImpl.java 46.17% <0.00%> (-0.37%) ⬇️
...ava/org/apache/rocketmq/filter/util/BitsArray.java 59.82% <0.00%> (ø)
...a/org/apache/rocketmq/store/StoreStatsService.java 34.53% <0.00%> (ø)
...apache/rocketmq/store/timer/TimerMessageStore.java 54.39% <0.00%> (+0.09%) ⬆️
... and 11 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~

Copy link
Contributor

@drpmma drpmma 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 a1d1cf8 into apache:develop Feb 6, 2023
RongtongJin added a commit to RongtongJin/rocketmq that referenced this pull request Feb 7, 2023
…pache#5984)

* When encountering the flow control code, pull it after 20ms instead of 3s

* When encountering the flow control code, pull it after 20ms instead of 3s
RongtongJin added a commit that referenced this pull request Feb 10, 2023
…r with controller mode (#6024)

* refactor: simplify getPID (#5962)

* [ISSUE #5923] Add example tiered storage backend service provider (#5926)

* implement example file segment

* add metrics

* add readme

* fix license

* fix tests

* fix links in README.md

* add comment to PosixFileSegment and mark as experimental

* fix test

* optimize image quality

* Remove the useless exception class: MQRedirectException #5963

* [ISSUE #5965] Fix lmqTopicQueueTable initialization (#5968)

* [ISSUE #5965] Fix lmqTopicQueueTable initialization

* [ISSUE #5965] Fix lmqTopicQueueTable initialization

* [ISSUE #5890] Fix dledger logging (#5959)

* Fix dledger logging

* Add bridge into store module

* [ISSUE #5860] Set the value of order when create or update topic (#5861)

* [ISSUE #5939]Adjust the MQClientInstance#sendHeartbeatToAllBroker catch code block log print level from info to warn (#5940)

* [ISSUE #5924] Optimize UtilAll#sleep method (#5925)

* [ISSUE #5924]Optimize UtilAll#sleep method

* polish code

* [ISSUE #5986] optimize the BrokerOuterAPITest class code

Co-authored-by: zhouyunpeng <2474138779@qq.com>

* [ISSUE #5971] Make the internal logs related to the dledger in the controller print to a file separately (#5972)

* Make the internal logs related to the dledger in the controller print to a file separately

* Make the internal logs related to the dledger in the controller print to a file separately

* [ISSUE #5969] Remvoe duplicate deleteUnusedStats in admin processor (#5973)

* [ISSUE #5847] Add checkBlock for hasMsgFromQueue

* [ISSUE #5983] Make consumer support flow control code better (#5984)

* When encountering the flow control code, pull it after 20ms instead of 3s

* When encountering the flow control code, pull it after 20ms instead of 3s

* [ISSUE #5896] feat:add pop consumer example (#5991)

* feat:add pop consumer

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* Update example/src/main/java/org/apache/rocketmq/example/simple/PushConsumer.java

Co-authored-by: Oliver <wqdyxnbd@163.com>

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

---------

Co-authored-by: mahaitao617 <mahaitao617@mahaitao617deMacBook-Pro.local>
Co-authored-by: Oliver <wqdyxnbd@163.com>

* [ISSUE #5942] Fix the produce count include the quantity of the system topic(#5943)

* [ISSUE #5999] Fix the TopicQueueMappingUtils comments typo (#6000)

* [ISSUE #5996] Optimize the RemotingSerializable class code (#5998)

* simplified RemotingSerializable null check

* optimize the RemotingSerializable class code

* [ISSUE #5994] [RIP-46] add pop and timer metrics (#5995)

* add pop and timer metrics
* fix according to review comment

* test(broker): add ReplicasManagerRegisterTest to test the register process

1. add ReplicasManagerRegisterTest to test the register process

* chore(pom): modify pom.xml to replace mockito with powermock

1. modify pom.xml to replace mockito with powermock

* build(bazel): export powermock in bazel

1. export powermock in bazel

---------

Co-authored-by: Xinda <xdshent@gmail.com>
Co-authored-by: SSpirits <admin@lv5.moe>
Co-authored-by: loboxu <loboxu@tencent.com>
Co-authored-by: pingww <pingw002@gmail.com>
Co-authored-by: Aaron Ai <yangkun.ayk@gmail.com>
Co-authored-by: Slideee <yechun@corp.netease.com>
Co-authored-by: mxsm <ljbmxsm@gmail.com>
Co-authored-by: hardyfish <85128645+hardyfish@users.noreply.github.com>
Co-authored-by: zhouyunpeng <2474138779@qq.com>
Co-authored-by: rongtong <jinrongtong5@163.com>
Co-authored-by: zhiliatom <87265072+zhiliatom@users.noreply.github.com>
Co-authored-by: zhouxiang <zhouxiang.zzx@alibaba-inc.com>
Co-authored-by: mahaitao <15828010639@163.com>
Co-authored-by: mahaitao617 <mahaitao617@mahaitao617deMacBook-Pro.local>
Co-authored-by: Oliver <wqdyxnbd@163.com>
TheR1sing3un added a commit to TheR1sing3un/rocketmq that referenced this pull request Feb 16, 2023
… broker with controller mode (apache#6024)

* refactor: simplify getPID (apache#5962)

* [ISSUE apache#5923] Add example tiered storage backend service provider (apache#5926)

* implement example file segment

* add metrics

* add readme

* fix license

* fix tests

* fix links in README.md

* add comment to PosixFileSegment and mark as experimental

* fix test

* optimize image quality

* Remove the useless exception class: MQRedirectException apache#5963

* [ISSUE apache#5965] Fix lmqTopicQueueTable initialization (apache#5968)

* [ISSUE apache#5965] Fix lmqTopicQueueTable initialization

* [ISSUE apache#5965] Fix lmqTopicQueueTable initialization

* [ISSUE apache#5890] Fix dledger logging (apache#5959)

* Fix dledger logging

* Add bridge into store module

* [ISSUE apache#5860] Set the value of order when create or update topic (apache#5861)

* [ISSUE apache#5939]Adjust the MQClientInstance#sendHeartbeatToAllBroker catch code block log print level from info to warn (apache#5940)

* [ISSUE apache#5924] Optimize UtilAll#sleep method (apache#5925)

* [ISSUE apache#5924]Optimize UtilAll#sleep method

* polish code

* [ISSUE apache#5986] optimize the BrokerOuterAPITest class code

Co-authored-by: zhouyunpeng <2474138779@qq.com>

* [ISSUE apache#5971] Make the internal logs related to the dledger in the controller print to a file separately (apache#5972)

* Make the internal logs related to the dledger in the controller print to a file separately

* Make the internal logs related to the dledger in the controller print to a file separately

* [ISSUE apache#5969] Remvoe duplicate deleteUnusedStats in admin processor (apache#5973)

* [ISSUE apache#5847] Add checkBlock for hasMsgFromQueue

* [ISSUE apache#5983] Make consumer support flow control code better (apache#5984)

* When encountering the flow control code, pull it after 20ms instead of 3s

* When encountering the flow control code, pull it after 20ms instead of 3s

* [ISSUE apache#5896] feat:add pop consumer example (apache#5991)

* feat:add pop consumer

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* Update example/src/main/java/org/apache/rocketmq/example/simple/PushConsumer.java

Co-authored-by: Oliver <wqdyxnbd@163.com>

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

---------

Co-authored-by: mahaitao617 <mahaitao617@mahaitao617deMacBook-Pro.local>
Co-authored-by: Oliver <wqdyxnbd@163.com>

* [ISSUE apache#5942] Fix the produce count include the quantity of the system topic(apache#5943)

* [ISSUE apache#5999] Fix the TopicQueueMappingUtils comments typo (apache#6000)

* [ISSUE apache#5996] Optimize the RemotingSerializable class code (apache#5998)

* simplified RemotingSerializable null check

* optimize the RemotingSerializable class code

* [ISSUE apache#5994] [RIP-46] add pop and timer metrics (apache#5995)

* add pop and timer metrics
* fix according to review comment

* test(broker): add ReplicasManagerRegisterTest to test the register process

1. add ReplicasManagerRegisterTest to test the register process

* chore(pom): modify pom.xml to replace mockito with powermock

1. modify pom.xml to replace mockito with powermock

* build(bazel): export powermock in bazel

1. export powermock in bazel

---------

Co-authored-by: Xinda <xdshent@gmail.com>
Co-authored-by: SSpirits <admin@lv5.moe>
Co-authored-by: loboxu <loboxu@tencent.com>
Co-authored-by: pingww <pingw002@gmail.com>
Co-authored-by: Aaron Ai <yangkun.ayk@gmail.com>
Co-authored-by: Slideee <yechun@corp.netease.com>
Co-authored-by: mxsm <ljbmxsm@gmail.com>
Co-authored-by: hardyfish <85128645+hardyfish@users.noreply.github.com>
Co-authored-by: zhouyunpeng <2474138779@qq.com>
Co-authored-by: rongtong <jinrongtong5@163.com>
Co-authored-by: zhiliatom <87265072+zhiliatom@users.noreply.github.com>
Co-authored-by: zhouxiang <zhouxiang.zzx@alibaba-inc.com>
Co-authored-by: mahaitao <15828010639@163.com>
Co-authored-by: mahaitao617 <mahaitao617@mahaitao617deMacBook-Pro.local>
Co-authored-by: Oliver <wqdyxnbd@163.com>
drpmma pushed a commit that referenced this pull request Feb 21, 2023
* When encountering the flow control code, pull it after 20ms instead of 3s

* When encountering the flow control code, pull it after 20ms instead of 3s
TheR1sing3un added a commit to TheR1sing3un/rocketmq that referenced this pull request Mar 13, 2023
… broker with controller mode (apache#6024)

* refactor: simplify getPID (apache#5962)

* [ISSUE apache#5923] Add example tiered storage backend service provider (apache#5926)

* implement example file segment

* add metrics

* add readme

* fix license

* fix tests

* fix links in README.md

* add comment to PosixFileSegment and mark as experimental

* fix test

* optimize image quality

* Remove the useless exception class: MQRedirectException apache#5963

* [ISSUE apache#5965] Fix lmqTopicQueueTable initialization (apache#5968)

* [ISSUE apache#5965] Fix lmqTopicQueueTable initialization

* [ISSUE apache#5965] Fix lmqTopicQueueTable initialization

* [ISSUE apache#5890] Fix dledger logging (apache#5959)

* Fix dledger logging

* Add bridge into store module

* [ISSUE apache#5860] Set the value of order when create or update topic (apache#5861)

* [ISSUE apache#5939]Adjust the MQClientInstance#sendHeartbeatToAllBroker catch code block log print level from info to warn (apache#5940)

* [ISSUE apache#5924] Optimize UtilAll#sleep method (apache#5925)

* [ISSUE apache#5924]Optimize UtilAll#sleep method

* polish code

* [ISSUE apache#5986] optimize the BrokerOuterAPITest class code

Co-authored-by: zhouyunpeng <2474138779@qq.com>

* [ISSUE apache#5971] Make the internal logs related to the dledger in the controller print to a file separately (apache#5972)

* Make the internal logs related to the dledger in the controller print to a file separately

* Make the internal logs related to the dledger in the controller print to a file separately

* [ISSUE apache#5969] Remvoe duplicate deleteUnusedStats in admin processor (apache#5973)

* [ISSUE apache#5847] Add checkBlock for hasMsgFromQueue

* [ISSUE apache#5983] Make consumer support flow control code better (apache#5984)

* When encountering the flow control code, pull it after 20ms instead of 3s

* When encountering the flow control code, pull it after 20ms instead of 3s

* [ISSUE apache#5896] feat:add pop consumer example (apache#5991)

* feat:add pop consumer

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* Update example/src/main/java/org/apache/rocketmq/example/simple/PushConsumer.java

Co-authored-by: Oliver <wqdyxnbd@163.com>

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

---------

Co-authored-by: mahaitao617 <mahaitao617@mahaitao617deMacBook-Pro.local>
Co-authored-by: Oliver <wqdyxnbd@163.com>

* [ISSUE apache#5942] Fix the produce count include the quantity of the system topic(apache#5943)

* [ISSUE apache#5999] Fix the TopicQueueMappingUtils comments typo (apache#6000)

* [ISSUE apache#5996] Optimize the RemotingSerializable class code (apache#5998)

* simplified RemotingSerializable null check

* optimize the RemotingSerializable class code

* [ISSUE apache#5994] [RIP-46] add pop and timer metrics (apache#5995)

* add pop and timer metrics
* fix according to review comment

* test(broker): add ReplicasManagerRegisterTest to test the register process

1. add ReplicasManagerRegisterTest to test the register process

* chore(pom): modify pom.xml to replace mockito with powermock

1. modify pom.xml to replace mockito with powermock

* build(bazel): export powermock in bazel

1. export powermock in bazel

---------

Co-authored-by: Xinda <xdshent@gmail.com>
Co-authored-by: SSpirits <admin@lv5.moe>
Co-authored-by: loboxu <loboxu@tencent.com>
Co-authored-by: pingww <pingw002@gmail.com>
Co-authored-by: Aaron Ai <yangkun.ayk@gmail.com>
Co-authored-by: Slideee <yechun@corp.netease.com>
Co-authored-by: mxsm <ljbmxsm@gmail.com>
Co-authored-by: hardyfish <85128645+hardyfish@users.noreply.github.com>
Co-authored-by: zhouyunpeng <2474138779@qq.com>
Co-authored-by: rongtong <jinrongtong5@163.com>
Co-authored-by: zhiliatom <87265072+zhiliatom@users.noreply.github.com>
Co-authored-by: zhouxiang <zhouxiang.zzx@alibaba-inc.com>
Co-authored-by: mahaitao <15828010639@163.com>
Co-authored-by: mahaitao617 <mahaitao617@mahaitao617deMacBook-Pro.local>
Co-authored-by: Oliver <wqdyxnbd@163.com>
RongtongJin added a commit that referenced this pull request Mar 14, 2023
…r with controller mode (#6024)

* refactor: simplify getPID (#5962)

* [ISSUE #5923] Add example tiered storage backend service provider (#5926)

* implement example file segment

* add metrics

* add readme

* fix license

* fix tests

* fix links in README.md

* add comment to PosixFileSegment and mark as experimental

* fix test

* optimize image quality

* Remove the useless exception class: MQRedirectException #5963

* [ISSUE #5965] Fix lmqTopicQueueTable initialization (#5968)

* [ISSUE #5965] Fix lmqTopicQueueTable initialization

* [ISSUE #5965] Fix lmqTopicQueueTable initialization

* [ISSUE #5890] Fix dledger logging (#5959)

* Fix dledger logging

* Add bridge into store module

* [ISSUE #5860] Set the value of order when create or update topic (#5861)

* [ISSUE #5939]Adjust the MQClientInstance#sendHeartbeatToAllBroker catch code block log print level from info to warn (#5940)

* [ISSUE #5924] Optimize UtilAll#sleep method (#5925)

* [ISSUE #5924]Optimize UtilAll#sleep method

* polish code

* [ISSUE #5986] optimize the BrokerOuterAPITest class code

Co-authored-by: zhouyunpeng <2474138779@qq.com>

* [ISSUE #5971] Make the internal logs related to the dledger in the controller print to a file separately (#5972)

* Make the internal logs related to the dledger in the controller print to a file separately

* Make the internal logs related to the dledger in the controller print to a file separately

* [ISSUE #5969] Remvoe duplicate deleteUnusedStats in admin processor (#5973)

* [ISSUE #5847] Add checkBlock for hasMsgFromQueue

* [ISSUE #5983] Make consumer support flow control code better (#5984)

* When encountering the flow control code, pull it after 20ms instead of 3s

* When encountering the flow control code, pull it after 20ms instead of 3s

* [ISSUE #5896] feat:add pop consumer example (#5991)

* feat:add pop consumer

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* Update example/src/main/java/org/apache/rocketmq/example/simple/PushConsumer.java

Co-authored-by: Oliver <wqdyxnbd@163.com>

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

---------

Co-authored-by: mahaitao617 <mahaitao617@mahaitao617deMacBook-Pro.local>
Co-authored-by: Oliver <wqdyxnbd@163.com>

* [ISSUE #5942] Fix the produce count include the quantity of the system topic(#5943)

* [ISSUE #5999] Fix the TopicQueueMappingUtils comments typo (#6000)

* [ISSUE #5996] Optimize the RemotingSerializable class code (#5998)

* simplified RemotingSerializable null check

* optimize the RemotingSerializable class code

* [ISSUE #5994] [RIP-46] add pop and timer metrics (#5995)

* add pop and timer metrics
* fix according to review comment

* test(broker): add ReplicasManagerRegisterTest to test the register process

1. add ReplicasManagerRegisterTest to test the register process

* chore(pom): modify pom.xml to replace mockito with powermock

1. modify pom.xml to replace mockito with powermock

* build(bazel): export powermock in bazel

1. export powermock in bazel

---------

Co-authored-by: Xinda <xdshent@gmail.com>
Co-authored-by: SSpirits <admin@lv5.moe>
Co-authored-by: loboxu <loboxu@tencent.com>
Co-authored-by: pingww <pingw002@gmail.com>
Co-authored-by: Aaron Ai <yangkun.ayk@gmail.com>
Co-authored-by: Slideee <yechun@corp.netease.com>
Co-authored-by: mxsm <ljbmxsm@gmail.com>
Co-authored-by: hardyfish <85128645+hardyfish@users.noreply.github.com>
Co-authored-by: zhouyunpeng <2474138779@qq.com>
Co-authored-by: rongtong <jinrongtong5@163.com>
Co-authored-by: zhiliatom <87265072+zhiliatom@users.noreply.github.com>
Co-authored-by: zhouxiang <zhouxiang.zzx@alibaba-inc.com>
Co-authored-by: mahaitao <15828010639@163.com>
Co-authored-by: mahaitao617 <mahaitao617@mahaitao617deMacBook-Pro.local>
Co-authored-by: Oliver <wqdyxnbd@163.com>
miles-ton pushed a commit to miles-ton/rocketmq that referenced this pull request Mar 16, 2023
… broker with controller mode (apache#6024)

* refactor: simplify getPID (apache#5962)

* [ISSUE apache#5923] Add example tiered storage backend service provider (apache#5926)

* implement example file segment

* add metrics

* add readme

* fix license

* fix tests

* fix links in README.md

* add comment to PosixFileSegment and mark as experimental

* fix test

* optimize image quality

* Remove the useless exception class: MQRedirectException apache#5963

* [ISSUE apache#5965] Fix lmqTopicQueueTable initialization (apache#5968)

* [ISSUE apache#5965] Fix lmqTopicQueueTable initialization

* [ISSUE apache#5965] Fix lmqTopicQueueTable initialization

* [ISSUE apache#5890] Fix dledger logging (apache#5959)

* Fix dledger logging

* Add bridge into store module

* [ISSUE apache#5860] Set the value of order when create or update topic (apache#5861)

* [ISSUE apache#5939]Adjust the MQClientInstance#sendHeartbeatToAllBroker catch code block log print level from info to warn (apache#5940)

* [ISSUE apache#5924] Optimize UtilAll#sleep method (apache#5925)

* [ISSUE apache#5924]Optimize UtilAll#sleep method

* polish code

* [ISSUE apache#5986] optimize the BrokerOuterAPITest class code

Co-authored-by: zhouyunpeng <2474138779@qq.com>

* [ISSUE apache#5971] Make the internal logs related to the dledger in the controller print to a file separately (apache#5972)

* Make the internal logs related to the dledger in the controller print to a file separately

* Make the internal logs related to the dledger in the controller print to a file separately

* [ISSUE apache#5969] Remvoe duplicate deleteUnusedStats in admin processor (apache#5973)

* [ISSUE apache#5847] Add checkBlock for hasMsgFromQueue

* [ISSUE apache#5983] Make consumer support flow control code better (apache#5984)

* When encountering the flow control code, pull it after 20ms instead of 3s

* When encountering the flow control code, pull it after 20ms instead of 3s

* [ISSUE apache#5896] feat:add pop consumer example (apache#5991)

* feat:add pop consumer

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* Update example/src/main/java/org/apache/rocketmq/example/simple/PushConsumer.java

Co-authored-by: Oliver <wqdyxnbd@163.com>

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

---------

Co-authored-by: mahaitao617 <mahaitao617@mahaitao617deMacBook-Pro.local>
Co-authored-by: Oliver <wqdyxnbd@163.com>

* [ISSUE apache#5942] Fix the produce count include the quantity of the system topic(apache#5943)

* [ISSUE apache#5999] Fix the TopicQueueMappingUtils comments typo (apache#6000)

* [ISSUE apache#5996] Optimize the RemotingSerializable class code (apache#5998)

* simplified RemotingSerializable null check

* optimize the RemotingSerializable class code

* [ISSUE apache#5994] [RIP-46] add pop and timer metrics (apache#5995)

* add pop and timer metrics
* fix according to review comment

* test(broker): add ReplicasManagerRegisterTest to test the register process

1. add ReplicasManagerRegisterTest to test the register process

* chore(pom): modify pom.xml to replace mockito with powermock

1. modify pom.xml to replace mockito with powermock

* build(bazel): export powermock in bazel

1. export powermock in bazel

---------

Co-authored-by: Xinda <xdshent@gmail.com>
Co-authored-by: SSpirits <admin@lv5.moe>
Co-authored-by: loboxu <loboxu@tencent.com>
Co-authored-by: pingww <pingw002@gmail.com>
Co-authored-by: Aaron Ai <yangkun.ayk@gmail.com>
Co-authored-by: Slideee <yechun@corp.netease.com>
Co-authored-by: mxsm <ljbmxsm@gmail.com>
Co-authored-by: hardyfish <85128645+hardyfish@users.noreply.github.com>
Co-authored-by: zhouyunpeng <2474138779@qq.com>
Co-authored-by: rongtong <jinrongtong5@163.com>
Co-authored-by: zhiliatom <87265072+zhiliatom@users.noreply.github.com>
Co-authored-by: zhouxiang <zhouxiang.zzx@alibaba-inc.com>
Co-authored-by: mahaitao <15828010639@163.com>
Co-authored-by: mahaitao617 <mahaitao617@mahaitao617deMacBook-Pro.local>
Co-authored-by: Oliver <wqdyxnbd@163.com>
fuyou001 pushed a commit to fuyou001/rocketmq that referenced this pull request Mar 16, 2023
… broker with controller mode (apache#6024)

* refactor: simplify getPID (apache#5962)

* [ISSUE apache#5923] Add example tiered storage backend service provider (apache#5926)

* implement example file segment

* add metrics

* add readme

* fix license

* fix tests

* fix links in README.md

* add comment to PosixFileSegment and mark as experimental

* fix test

* optimize image quality

* Remove the useless exception class: MQRedirectException apache#5963

* [ISSUE apache#5965] Fix lmqTopicQueueTable initialization (apache#5968)

* [ISSUE apache#5965] Fix lmqTopicQueueTable initialization

* [ISSUE apache#5965] Fix lmqTopicQueueTable initialization

* [ISSUE apache#5890] Fix dledger logging (apache#5959)

* Fix dledger logging

* Add bridge into store module

* [ISSUE apache#5860] Set the value of order when create or update topic (apache#5861)

* [ISSUE apache#5939]Adjust the MQClientInstance#sendHeartbeatToAllBroker catch code block log print level from info to warn (apache#5940)

* [ISSUE apache#5924] Optimize UtilAll#sleep method (apache#5925)

* [ISSUE apache#5924]Optimize UtilAll#sleep method

* polish code

* [ISSUE apache#5986] optimize the BrokerOuterAPITest class code

Co-authored-by: zhouyunpeng <2474138779@qq.com>

* [ISSUE apache#5971] Make the internal logs related to the dledger in the controller print to a file separately (apache#5972)

* Make the internal logs related to the dledger in the controller print to a file separately

* Make the internal logs related to the dledger in the controller print to a file separately

* [ISSUE apache#5969] Remvoe duplicate deleteUnusedStats in admin processor (apache#5973)

* [ISSUE apache#5847] Add checkBlock for hasMsgFromQueue

* [ISSUE apache#5983] Make consumer support flow control code better (apache#5984)

* When encountering the flow control code, pull it after 20ms instead of 3s

* When encountering the flow control code, pull it after 20ms instead of 3s

* [ISSUE apache#5896] feat:add pop consumer example (apache#5991)

* feat:add pop consumer

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* Update example/src/main/java/org/apache/rocketmq/example/simple/PushConsumer.java

Co-authored-by: Oliver <wqdyxnbd@163.com>

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

* feat:fix

---------

Co-authored-by: mahaitao617 <mahaitao617@mahaitao617deMacBook-Pro.local>
Co-authored-by: Oliver <wqdyxnbd@163.com>

* [ISSUE apache#5942] Fix the produce count include the quantity of the system topic(apache#5943)

* [ISSUE apache#5999] Fix the TopicQueueMappingUtils comments typo (apache#6000)

* [ISSUE apache#5996] Optimize the RemotingSerializable class code (apache#5998)

* simplified RemotingSerializable null check

* optimize the RemotingSerializable class code

* [ISSUE apache#5994] [RIP-46] add pop and timer metrics (apache#5995)

* add pop and timer metrics
* fix according to review comment

* test(broker): add ReplicasManagerRegisterTest to test the register process

1. add ReplicasManagerRegisterTest to test the register process

* chore(pom): modify pom.xml to replace mockito with powermock

1. modify pom.xml to replace mockito with powermock

* build(bazel): export powermock in bazel

1. export powermock in bazel

---------

Co-authored-by: Xinda <xdshent@gmail.com>
Co-authored-by: SSpirits <admin@lv5.moe>
Co-authored-by: loboxu <loboxu@tencent.com>
Co-authored-by: pingww <pingw002@gmail.com>
Co-authored-by: Aaron Ai <yangkun.ayk@gmail.com>
Co-authored-by: Slideee <yechun@corp.netease.com>
Co-authored-by: mxsm <ljbmxsm@gmail.com>
Co-authored-by: hardyfish <85128645+hardyfish@users.noreply.github.com>
Co-authored-by: zhouyunpeng <2474138779@qq.com>
Co-authored-by: rongtong <jinrongtong5@163.com>
Co-authored-by: zhiliatom <87265072+zhiliatom@users.noreply.github.com>
Co-authored-by: zhouxiang <zhouxiang.zzx@alibaba-inc.com>
Co-authored-by: mahaitao <15828010639@163.com>
Co-authored-by: mahaitao617 <mahaitao617@mahaitao617deMacBook-Pro.local>
Co-authored-by: Oliver <wqdyxnbd@163.com>
RongtongJin added a commit to RongtongJin/rocketmq that referenced this pull request Mar 19, 2023
…pache#5984)

* When encountering the flow control code, pull it after 20ms instead of 3s

* When encountering the flow control code, pull it after 20ms instead of 3s

(cherry picked from commit a1d1cf8)

# Conflicts:
#	client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultLitePullConsumerImpl.java
#	client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultMQPushConsumerImpl.java
odbozhou pushed a commit that referenced this pull request Mar 20, 2023
…6395)

* When encountering the flow control code, pull it after 20ms instead of 3s

* When encountering the flow control code, pull it after 20ms instead of 3s

(cherry picked from commit a1d1cf8)

# Conflicts:
#	client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultLitePullConsumerImpl.java
#	client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultMQPushConsumerImpl.java
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.

Make consumer support flow control code better
8 participants