This is an automated email from the ASF dual-hosted git repository. jinrongtong pushed a commit to branch dledger-controller-snapshot in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit ad13f0ef292ba6a442efb0470ce778947ed0421c Merge: dabdfc177 6f49a1034 Author: RongtongJin <[email protected]> AuthorDate: Sat Nov 26 21:58:54 2022 +0800 Merge remote-tracking branch 'origin/develop' into dledger-controller-snapshot .../apache/rocketmq/broker/BrokerController.java | 6 +- .../rocketmq/broker/BrokerPreOnlineService.java | 2 +- .../client/DefaultConsumerIdsChangeListener.java | 2 +- .../broker/filtersrv/FilterServerManager.java | 2 +- .../rocketmq/broker/latency/BrokerFastFailure.java | 2 +- .../longpolling/LmqPullRequestHoldService.java | 2 +- .../broker/longpolling/PullRequestHoldService.java | 2 +- .../apache/rocketmq/broker/out/BrokerOuterAPI.java | 10 +- .../processor/AbstractSendMessageProcessor.java | 2 +- .../broker/processor/NotificationProcessor.java | 2 +- .../broker/processor/PopBufferMergeService.java | 2 +- .../broker/processor/PopMessageProcessor.java | 4 +- .../broker/processor/PopReviveService.java | 2 +- .../broker/processor/PullMessageProcessor.java | 2 +- .../broker/processor/SendMessageProcessor.java | 2 +- .../topic/TopicQueueMappingCleanService.java | 2 +- .../TransactionalMessageCheckService.java | 2 +- broker/src/main/resources/rmq.broker.logback.xml | 667 ++++++++++++--------- .../broker/processor/SendMessageProcessorTest.java | 2 +- .../rocketmq/common}/AbortProcessException.java | 5 +- .../rocketmq/common/AbstractBrokerRunnable.java | 18 +- .../org/apache/rocketmq/common/BrokerIdentity.java | 8 +- .../apache/rocketmq/common/ThreadFactoryImpl.java | 2 +- .../apache/rocketmq/container/BrokerContainer.java | 6 +- .../rocketmq/container/BrokerContainerStartup.java | 2 +- .../rocketmq/container/InnerBrokerController.java | 4 +- docs/cn/BrokerContainer.md | 31 +- .../remoting/netty/NettyRemotingAbstract.java | 34 +- .../rocketmq/store/AllocateMappedFileService.java | 2 +- .../java/org/apache/rocketmq/store/CommitLog.java | 8 +- .../apache/rocketmq/store/DefaultMessageStore.java | 18 +- .../apache/rocketmq/store/StoreStatsService.java | 2 +- .../apache/rocketmq/store/ha/DefaultHAClient.java | 2 +- .../rocketmq/store/ha/DefaultHAConnection.java | 4 +- .../apache/rocketmq/store/ha/DefaultHAService.java | 2 +- .../rocketmq/store/ha/GroupTransferService.java | 2 +- .../ha/HAConnectionStateNotificationService.java | 2 +- .../store/ha/autoswitch/AutoSwitchHAClient.java | 2 +- .../ha/autoswitch/AutoSwitchHAConnection.java | 4 +- .../store/ha/autoswitch/AutoSwitchHAService.java | 2 +- .../apache/rocketmq/store/index/IndexService.java | 2 +- .../rocketmq/store/kv/CompactionService.java | 2 +- .../rocketmq/store/timer/TimerMessageStore.java | 14 +- .../org/apache/rocketmq/store/ha/HAServerTest.java | 2 +- .../org/apache/rocketmq/test/util/VerifyUtils.java | 11 +- .../rocketmq/test/delay/NormalMsgDelayIT.java | 11 +- 46 files changed, 514 insertions(+), 405 deletions(-)
