Commit Graph
182 Commits
Author SHA1 Message Date
RongtongJin a55a621594 Merge branch 'develop-merge-5.0.0' into 5.0.0-beta-dledger-controller
# Conflicts:
#	broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java
#	common/src/main/java/org/apache/rocketmq/common/protocol/RequestCode.java
#	store/src/main/java/org/apache/rocketmq/store/config/MessageStoreConfig.java
#	tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java
2022-07-08 15:35:41 +08:00
RongtongJin 3fadc8f30c Merge branch '5.0.0-beta' into develop
# 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
2022-07-08 15:03:54 +08:00
RongtongJin 505cb2af9b Merge branch '5.0.0-beta' into 5.0.0-beta-dledger-controller
# Conflicts:
#	store/src/main/java/org/apache/rocketmq/store/MessageStore.java
2022-06-30 14:24:30 +08:00
hill 32733e7674 [maven-release-plugin] prepare for next development iteration 2022-06-20 16:17:12 +08:00
hill 06f2208a34 [maven-release-plugin] prepare release rocketmq-all-4.9.4 2022-06-20 16:16:54 +08:00
凌楚 96e9e48676 Revert "Add new APIs for producer (#3987)"
This reverts commit 8fc952d20c.
2022-06-20 12:17:30 +08:00
Zhouxiang Zhan 1f4ef2b311 [ISSUE #4419] Upgrade maven-checkstyle-plugin to 3.1.2 (#4420)
* Fix incorrect indentation issue
2022-06-06 19:39:38 +08:00
rongtong 14042fa96a Update dledger version to 0.2.6 (#4417) 2022-06-06 11:15:40 +08:00
hzh0425 8515a8d091 [Summer of code] Reuse dledger remotingServer in controller mode. (#4409)
* reuse dledger remotingServer in Controller

* reuse dledger remotingServer in Namesrv when startup controller

* fix some bugs in controller

* trigger ci

* code review

* fix controllerManagerTest bug
2022-06-05 15:23:25 +08:00
shannon.dl 3bd4b2b2f6 Update fastjson version to 1.2.69_noneautotype 2022-05-30 17:51:19 +08:00
hzh0425 97e6cecbf9 [Summer of code] Fix some bugs in controller mode.
* modify pom for using dledger

* rename option

* 1.send heartbeat to haclient when get epochEntry failed to hold connection.
2.update lastCatchupTimeMs in time.

* fix some bugs
2022-05-26 20:44:34 +08:00
Aaron Ai af011b1e2d Make it compile with Java9+ (#4373) 2022-05-26 10:02:32 +08:00
Aaron Ai 65a8525a60 Formatting code of maven dependencies management (#4371) 2022-05-25 12:53:19 +08:00
Heng Du 5386a3c996 bump up fastjson version
bump up fastjson version
2022-05-25 10:00:21 +08:00
hzh0425 4e9e4e3efb [Summer of code] Stand alone a new controller module (#4333)
* feature: add new module controller

* feature: add heartbeat manager

* feature: link requestProcessor and heartbeatmanager

* feature: add controllerManager and startup

* feature: remove namesrv's duplicate controller code

* review code
2022-05-18 20:16:43 +08:00
wangfan 5584a78977 [ISSUE #4203] Support zstd/lz4 compression to improve send/receive performance 2022-04-28 10:19:52 +08:00
RongtongJin 3cd0ec9a83 Merge remote-tracking branch 'apache/5.0.0-beta' into 5.0.0-beta-tmp
# Conflicts:
#	broker/src/main/java/org/apache/rocketmq/broker/processor/PopMessageProcessor.java
2022-03-19 09:41:42 +08:00
Aaron Ai 8fc952d20c Add new APIs for producer (#3987) 2022-03-18 12:44:53 +08:00
rongtong 27ab1dfdcd feature(container&remoting):[RIP-31][PART-A]Support RocketMQ BrokerContainer (#3976) 2022-03-14 14:50:28 +08:00
RongtongJin 78dde88cf9 Prepare for next development iteration 2022-03-12 21:13:24 +08:00
RongtongJin a17fa7605c [maven-release-plugin] prepare release rocketmq-all-5.0.0-ALPHA 2022-03-11 10:37:19 +08:00
RongtongJin e33213c752 Upgrade version to 5.0.0-alpha-snapshot 2022-03-04 16:44:03 +08:00
RongtongJin 87d9614d34 Resolve all conflicts and pass all UTs 2022-03-04 16:38:04 +08:00
RongtongJin 0d15e6c2d5 Merge 5.0.0-alpha-merge with develop branch 2022-02-25 17:43:06 +08:00
tigerlee b606d9c638 [maven-release-plugin] prepare for next development iteration 2022-02-22 00:25:55 +08:00
tigerlee c7989f8574 [maven-release-plugin] prepare release rocketmq-all-4.9.3 2022-02-22 00:25:37 +08:00
tigerlee 13933297d1 [maven-release-plugin] prepare for next development iteration 2022-02-21 21:33:20 +08:00
tigerlee 666e96b6dd [maven-release-plugin] prepare release rocketmq-all-4.9.3 2022-02-21 21:33:02 +08:00
Heng Du a45c7bc60e [ISSUE #3852]Move the Logappender module to external (#3851)
* feat(logappender) move logappender to external(https://lists.apache.org/thread/938sjby3hnnzcttpp20p17ywhc0rgr8s)

* remove logappender module
2022-02-16 10:45:38 +08:00
PJ Fanning dbbc88a6fe guava 31.0.1-jre (#3821)
https://github.com/apache/rocketmq/issues/3818
2022-02-07 09:44:30 +08:00
PJ Fanning 32511145ae [Issue-3814] use snakeyaml 1.30 (#3815)
due to a CVE
2022-02-06 20:41:19 +08:00
PJ Fanning 32dd2d82c1 [Issue-3816] upgrade log4jv2 to 2.17.1 (#3817)
https://github.com/apache/rocketmq/issues/3816
2022-02-05 23:44:21 +08:00
yuz10 4f39218066 Avoid new lines in log (#3762) 2022-01-16 20:38:48 +08:00
ltamber 0b612ff813 [ISSUE #3223]Optimize startup script to support greater jdk version (#3224)
* support jdk9 and later version

* support jdk9 and later version
2022-01-12 11:16:10 +08:00
ltamber ed710abf85 bump up log4j-slf4j-impl version to 2.15.0 (#3623) 2021-12-16 20:19:00 +08:00
ltamber 4593ad4a59 bump up log4j-core version to 2.15.0 (#3621) 2021-12-10 21:22:54 +08:00
tigerlee 21faa68b4c [maven-release-plugin] prepare for next development iteration 2021-10-22 13:44:14 +08:00
tigerlee c840b20833 [maven-release-plugin] prepare release rocketmq-all-4.9.2 2021-10-22 13:43:57 +08:00
odbozhou 2bf133be29 Merge branch 'develop' into 5.0.0-preview
# Conflicts:
#	.travis.yml
#	acl/pom.xml
#	broker/pom.xml
#	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/SendMessageProcessor.java
#	client/pom.xml
#	client/src/main/java/org/apache/rocketmq/client/impl/consumer/RebalanceImpl.java
#	client/src/main/java/org/apache/rocketmq/client/impl/factory/MQClientInstance.java
#	client/src/test/java/org/apache/rocketmq/client/impl/MQClientAPIImplTest.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
#	distribution/pom.xml
#	example/pom.xml
#	filter/pom.xml
#	logappender/pom.xml
#	logging/pom.xml
#	namesrv/pom.xml
#	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
#	srvutil/pom.xml
#	store/pom.xml
#	store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java
#	test/pom.xml
#	tools/pom.xml
#	tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java
2021-09-24 15:35:46 +08:00
odbozhou 48d3c7eeba [maven-release-plugin] prepare for next development iteration 2021-08-27 15:17:29 +08:00
odbozhou d969670ea5 [maven-release-plugin] prepare release rocketmq-all-5.0.0-PREVIEW 2021-08-27 15:17:11 +08:00
odbozhou bb6daf7883 change version to 5.0.0-PREVIEW-SNAPSHOT 2021-08-27 10:59:32 +08:00
odbozhou 86193a844b change version to 5.0.0-PREVIEW 2021-08-27 10:54:47 +08:00
zhoubo 0f6b5a3deb [ISSUE #3290] Test case testProcessRequest_RegisterBrokerLogicalQueue bug fix (#3291)
* test case testProcessRequest_RegisterBrokerLogicalQueue bug fix

* fix test case MQClientInstanceTest.init error

* upgrade mockito to 3.12.4

* change reuseForks to false

* rollback MQClientInstanceTest modify
2021-08-27 10:19:54 +08:00
zongtanghu a7e71cb4ca [maven-release-plugin] prepare for next development iteration 2021-08-16 21:21:07 +08:00
zongtanghu a1bfe1afce [maven-release-plugin] prepare release rocketmq-all-4.9.1 2021-08-16 21:20:36 +08:00
duhenglucky 48fa70bc8c Merge branch 5.0.0-preview into pop_consumer 2021-06-29 13:39:20 +08:00
messense 361eb8d286 Upgrade netty-all dependency version to 4.1.65.Final 2021-06-23 13:36:34 +08:00
zongtanghu df1d93fc88 [maven-release-plugin] prepare for next development iteration 2021-06-10 21:36:05 +08:00
zongtanghu 5203d52f1b [maven-release-plugin] prepare release rocketmq-all-4.9.0 2021-06-10 21:35:41 +08:00