-
Notifications
You must be signed in to change notification settings - Fork 11.6k
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
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[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 (tools)
[RIP-19] Pop Consuming (integration test)
[RIP-19]Pop consumer docs
# 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
Polish pop consume comment
[RIP-19] Server-side rebalance, lightweight consumer client support
[RIP-21] Logic Queue submodule common & client
This reverts commit df5e885.
This reverts commit 8fc952d.
* 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
Codecov Report
@@ 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
Continue to review full report at Codecov.
|
ef7a49d
to
14b0638
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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
.[ISSUE #123] Fix UnknownException when host config not exist
. Each commit in the pull request should have a meaningful subject line and body.mvn -B clean apache-rat:check findbugs:findbugs checkstyle:checkstyle
to make sure basic checks pass. Runmvn clean install -DskipITs
to make sure unit-test pass. Runmvn clean test-compile failsafe:integration-test
to make sure integration-test pass.