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

The code of 5.0.0-beta merge into develop branch #4578

Merged
merged 144 commits into from
Jul 13, 2022
Merged

Conversation

RongtongJin
Copy link
Contributor

@RongtongJin RongtongJin commented Jul 8, 2022

Make sure set the target branch to develop

What is the purpose of the change

Recently we released 4.9.4 LTS version. The LTS version is the long-term support version. Subsequent bug fixes will be backported to this version from the trunk in a timely manner. We have created a 4.9.x branch, which is used for the long-term repair of bugs in RocketMQ 4.9.x.

This pull request will now merge the code in 5.0.0-beta into the develop branch. All the new features of RocketMQ 5.x will be in the develop branch later. Let’s look forward to the first version of RocketMQ 5.0.

Brief changelog

All the changes in 5.0.0-beta branch

Verifying this change

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.

ayanamist and others added 30 commits March 9, 2021 11:04
[RIP-19] Pop Consuming (submodule "common")
[RIP-19] Pop Consuming (submodule "store")
Fix issue that when messages pop out but not ack so redeliver to retry topic, and next pop start from max offset so skip these messages incorrectly.
[RIP-19] Pop Consuming (submodule "broker")
[RIP-19] Pop Consuming (client)
[RIP-19] Pop Consuming (integration test)
# Conflicts:
#	client/src/test/java/org/apache/rocketmq/client/consumer/DefaultLitePullConsumerTest.java
#	client/src/test/java/org/apache/rocketmq/client/consumer/DefaultMQPushConsumerTest.java
#	client/src/test/java/org/apache/rocketmq/client/trace/DefaultMQConsumerWithTraceTest.java
#	pom.xml
[RIP-19] Server-side rebalance,  lightweight consumer client support
[RIP-21] Logic Queue submodule common & client
drpmma and others added 18 commits June 6, 2022 16:29
* Delay the start of some heavy components.

* Remove the code for rechecking reput position.

* Make ConsumeQueue and BatchConsumeQueue program to an interface: MessageStore, not an implementation: DefaultMessageStore.

* Transfer methods that should not belong to FileQueueLifeCycle to ConsumeQueueInterface.

* Configurable method doCheckReputOffsetFromCq.

* Fix naming issues.
* Fix the unstable test

* Fix

* Fix

* Await refresh metadata instead of sleep

* Trivious changes
…gMaster is false (#4554)

* Automatic degradation is not performed When enableSlaveActingMaster=false

* Add more UTs
# Conflicts:
#	acl/pom.xml
#	broker/pom.xml
#	broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
#	broker/src/main/java/org/apache/rocketmq/broker/out/BrokerOuterAPI.java
#	broker/src/main/java/org/apache/rocketmq/broker/plugin/MessageStoreFactory.java
#	broker/src/main/java/org/apache/rocketmq/broker/processor/AbstractSendMessageProcessor.java
#	broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java
#	broker/src/main/java/org/apache/rocketmq/broker/processor/ClientManageProcessor.java
#	broker/src/main/java/org/apache/rocketmq/broker/processor/ConsumerManageProcessor.java
#	broker/src/main/java/org/apache/rocketmq/broker/processor/EndTransactionProcessor.java
#	broker/src/main/java/org/apache/rocketmq/broker/processor/ForwardRequestProcessor.java
#	broker/src/main/java/org/apache/rocketmq/broker/processor/PullMessageProcessor.java
#	broker/src/main/java/org/apache/rocketmq/broker/processor/QueryMessageProcessor.java
#	broker/src/main/java/org/apache/rocketmq/broker/processor/SendMessageProcessor.java
#	broker/src/main/java/org/apache/rocketmq/broker/transaction/jdbc/JDBCTransactionStore.java
#	broker/src/test/java/org/apache/rocketmq/broker/processor/SendMessageProcessorTest.java
#	client/pom.xml
#	client/src/main/java/org/apache/rocketmq/client/consumer/rebalance/AllocateMessageQueueAveragely.java
#	client/src/main/java/org/apache/rocketmq/client/consumer/rebalance/AllocateMessageQueueAveragelyByCircle.java
#	client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java
#	client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultMQPushConsumerImpl.java
#	client/src/main/java/org/apache/rocketmq/client/impl/consumer/RebalanceImpl.java
#	client/src/test/java/org/apache/rocketmq/client/consumer/DefaultLitePullConsumerTest.java
#	common/pom.xml
#	common/src/main/java/org/apache/rocketmq/common/MQVersion.java
#	common/src/main/java/org/apache/rocketmq/common/protocol/RequestCode.java
#	common/src/main/java/org/apache/rocketmq/common/protocol/header/PullMessageRequestHeader.java
#	common/src/main/java/org/apache/rocketmq/common/protocol/route/BrokerData.java
#	common/src/main/java/org/apache/rocketmq/common/protocol/route/TopicRouteData.java
#	common/src/main/java/org/apache/rocketmq/common/sysflag/MessageSysFlag.java
#	common/src/main/java/org/apache/rocketmq/common/utils/ServiceProvider.java
#	common/src/test/java/org/apache/rocketmq/common/message/MessageDecoderTest.java
#	distribution/pom.xml
#	example/pom.xml
#	filter/pom.xml
#	logging/pom.xml
#	logging/src/main/java/org/apache/rocketmq/logging/inner/Level.java
#	namesrv/pom.xml
#	namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvController.java
#	namesrv/src/main/java/org/apache/rocketmq/namesrv/processor/DefaultRequestProcessor.java
#	namesrv/src/main/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManager.java
#	openmessaging/pom.xml
#	pom.xml
#	remoting/pom.xml
#	remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingAbstract.java
#	remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingClient.java
#	remoting/src/main/java/org/apache/rocketmq/remoting/protocol/RemotingCommand.java
#	remoting/src/main/java/org/apache/rocketmq/remoting/protocol/RemotingSerializable.java
#	srvutil/pom.xml
#	store/pom.xml
#	store/src/main/java/org/apache/rocketmq/store/CommitLog.java
#	store/src/main/java/org/apache/rocketmq/store/ConsumeQueue.java
#	store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java
#	store/src/main/java/org/apache/rocketmq/store/MultiDispatch.java
#	store/src/main/java/org/apache/rocketmq/store/dledger/DLedgerCommitLog.java
#	store/src/main/java/org/apache/rocketmq/store/ha/HAConnection.java
#	store/src/main/java/org/apache/rocketmq/store/ha/HAService.java
#	store/src/main/java/org/apache/rocketmq/store/index/IndexFile.java
#	store/src/main/java/org/apache/rocketmq/store/logfile/DefaultMappedFile.java
#	store/src/main/java/org/apache/rocketmq/store/stats/BrokerStatsManager.java
#	store/src/test/java/org/apache/rocketmq/store/DefaultMessageStoreCleanFilesTest.java
#	store/src/test/java/org/apache/rocketmq/store/MultiDispatchTest.java
#	store/src/test/java/org/apache/rocketmq/store/dledger/DLedgerCommitlogTest.java
#	test/pom.xml
#	tools/pom.xml
#	tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExt.java
#	tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtImpl.java
#	tools/src/main/java/org/apache/rocketmq/tools/admin/MQAdminExt.java
#	tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java
#	tools/src/main/java/org/apache/rocketmq/tools/command/topic/DeleteTopicSubCommand.java
@RongtongJin RongtongJin changed the title The code of branch 5.0.0-beta merge into develop branch The code of 5.0.0-beta merge into develop branch Jul 8, 2022
@codecov-commenter
Copy link

codecov-commenter commented Jul 8, 2022

Codecov Report

Merging #4578 (a2c96fd) into develop (35ce9ad) will decrease coverage by 4.61%.
The diff coverage is 29.76%.

@@              Coverage Diff              @@
##             develop    #4578      +/-   ##
=============================================
- Coverage      48.25%   43.64%   -4.62%     
- Complexity      5143     6242    +1099     
=============================================
  Files            649      817     +168     
  Lines          43037    57654   +14617     
  Branches        5629     7873    +2244     
=============================================
+ Hits           20766    25161    +4395     
- Misses         19768    29258    +9490     
- Partials        2503     3235     +732     
Impacted Files Coverage Δ
...a/org/apache/rocketmq/broker/BrokerController.java 49.17% <ø> (+3.03%) ⬆️
...ache/rocketmq/broker/client/ConsumerGroupInfo.java 55.85% <0.00%> (+6.76%) ⬆️
...ache/rocketmq/broker/client/net/Broker2Client.java 2.48% <0.00%> (ø)
...ketmq/broker/dledger/DLedgerRoleChangeHandler.java 0.00% <0.00%> (ø)
.../broker/longpolling/LmqPullRequestHoldService.java 0.00% <0.00%> (ø)
...e/rocketmq/broker/longpolling/ManyPullRequest.java 0.00% <0.00%> (ø)
...cketmq/broker/longpolling/NotificationRequest.java 0.00% <0.00%> (ø)
...tmq/broker/longpolling/PullRequestHoldService.java 16.83% <0.00%> (-3.66%) ⬇️
.../rocketmq/broker/pagecache/OneMessageTransfer.java 24.00% <ø> (ø)
...etmq/broker/plugin/AbstractPluginMessageStore.java 0.00% <0.00%> (ø)
... and 465 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 35ce9ad...a2c96fd. Read the comment docs.

@coveralls
Copy link

coveralls commented Jul 12, 2022

Coverage Status

Coverage decreased (-4.3%) to 47.709% when pulling a2c96fd on develop-merge-5.0.0 into 35ce9ad on develop.

@duhenglucky duhenglucky merged commit 10326b4 into develop Jul 13, 2022
@duhenglucky duhenglucky added this to the 5.0.0 milestone Jul 13, 2022
@RongtongJin RongtongJin deleted the develop-merge-5.0.0 branch July 13, 2022 07:38
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.

None yet