This is an automated email from the ASF dual-hosted git repository. maixiaohai pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit 2caa7a48b3b742ffc951789d7816da003b9fc55a Merge: 0e14247 df1d93f Author: zhangxu16 <[email protected]> AuthorDate: Thu Jun 17 05:00:11 2021 +0800 Merge branch 'master' of github.com:apache/rocketmq .travis.yml | 32 ++- LICENSE | 2 +- NOTICE | 2 +- acl/pom.xml | 2 +- .../apache/rocketmq/acl/common/AclConstants.java | 10 + .../org/apache/rocketmq/acl/common/Permission.java | 29 +- .../rocketmq/acl/plain/PlainPermissionManager.java | 44 +-- .../acl/plain/RemoteAddressStrategyFactory.java | 2 +- .../apache/rocketmq/acl/common/PermissionTest.java | 24 ++ .../acl/plain/PlainAccessValidatorTest.java | 20 ++ broker/pom.xml | 2 +- .../rocketmq/broker/mqtrace/SendMessageHook.java | 6 +- .../broker/offset/ConsumerOffsetManager.java | 16 ++ .../apache/rocketmq/broker/out/BrokerOuterAPI.java | 2 +- .../broker/processor/AdminBrokerProcessor.java | 4 + .../broker/processor/PullMessageProcessor.java | 4 +- .../broker/processor/SendMessageProcessor.java | 2 + .../rocketmq/broker/topic/TopicConfigManager.java | 18 +- .../queue/TransactionalMessageServiceImpl.java | 2 +- .../apache/rocketmq/broker/BrokerOuterAPITest.java | 2 +- client/pom.xml | 18 +- .../org/apache/rocketmq/client/ClientConfig.java | 6 +- .../rocketmq/client/common/ThreadLocalIndex.java | 7 +- .../client/consumer/DefaultLitePullConsumer.java | 65 +++++ .../client/hook/EndTransactionContext.java | 86 ++++++ .../EndTransactionHook.java} | 10 +- .../client/impl/ClientRemotingProcessor.java | 2 - .../apache/rocketmq/client/impl/MQAdminImpl.java | 16 +- .../rocketmq/client/impl/MQClientAPIImpl.java | 3 +- .../client/impl/consumer/AssignedMessageQueue.java | 5 +- .../consumer/ConsumeMessageOrderlyService.java | 4 +- .../impl/consumer/DefaultLitePullConsumerImpl.java | 83 +++++- .../impl/consumer/DefaultMQPullConsumerImpl.java | 11 +- .../impl/consumer/DefaultMQPushConsumerImpl.java | 25 +- .../client/impl/consumer/ProcessQueue.java | 56 ++-- .../rocketmq/client/impl/consumer/PullRequest.java | 10 +- .../client/impl/consumer/RebalanceImpl.java | 20 +- .../impl/consumer/RebalanceLitePullImpl.java | 18 +- .../client/impl/consumer/RebalancePullImpl.java | 7 + .../client/impl/consumer/RebalancePushImpl.java | 25 +- .../client/impl/factory/MQClientInstance.java | 2 +- .../impl/producer/DefaultMQProducerImpl.java | 43 ++- .../client/impl/producer/TopicPublishInfo.java | 4 +- .../client/latency/LatencyFaultToleranceImpl.java | 2 +- .../rocketmq/client/latency/MQFaultStrategy.java | 4 +- .../client/producer/DefaultMQProducer.java | 13 +- .../client/producer/TransactionMQProducer.java | 4 + .../client/trace/AsyncTraceDispatcher.java | 6 +- .../apache/rocketmq/client/trace/TraceBean.java | 29 +- .../rocketmq/client/trace/TraceConstants.java | 16 ++ .../rocketmq/client/trace/TraceDataEncoder.java | 47 +++- .../apache/rocketmq/client/trace/TraceType.java | 1 + .../apache/rocketmq/client/trace/TraceView.java | 12 +- .../hook/ConsumeMessageOpenTracingHookImpl.java | 95 +++++++ .../trace/hook/ConsumeMessageTraceHookImpl.java | 16 +- .../hook/EndTransactionOpenTracingHookImpl.java | 72 +++++ ...kImpl.java => EndTransactionTraceHookImpl.java} | 70 ++--- .../trace/hook/SendMessageOpenTracingHookImpl.java | 88 ++++++ .../trace/hook/SendMessageTraceHookImpl.java | 1 - .../client/common/ThreadLocalIndexTest.java | 10 +- .../consumer/DefaultLitePullConsumerTest.java | 58 ++-- .../client/consumer/DefaultMQPushConsumerTest.java | 146 +++++----- .../ConsumeMessageConcurrentlyServiceTest.java | 42 +-- .../client/impl/factory/MQClientInstanceTest.java | 6 +- .../client/producer/DefaultMQProducerTest.java | 2 +- ...a => DefaultMQConsumerWithOpenTracingTest.java} | 237 +++++----------- .../trace/DefaultMQConsumerWithTraceTest.java | 46 ++-- .../DefaultMQLitePullConsumerWithTraceTest.java | 305 +++++++++++++++++++++ ...a => DefaultMQProducerWithOpenTracingTest.java} | 98 ++----- .../trace/DefaultMQProducerWithTraceTest.java | 4 +- .../client/trace/TraceDataEncoderTest.java | 48 +++- .../rocketmq/client/trace/TraceViewTest.java | 40 +-- ... TransactionMQProducerWithOpenTracingTest.java} | 125 ++++----- ...ava => TransactionMQProducerWithTraceTest.java} | 111 ++++---- client/src/test/resources/log4j2.xml | 29 ++ common/pom.xml | 2 +- .../java/org/apache/rocketmq/common/MQVersion.java | 2 +- .../apache/rocketmq/common/constant/PermName.java | 4 +- .../apache/rocketmq/common/filter/FilterAPI.java | 5 +- .../rocketmq/common/hook/FilterCheckHook.java | 4 +- .../rocketmq/common/message/MessageDecoder.java | 16 +- .../DeleteSubscriptionGroupRequestHeader.java | 10 + .../rocketmq/common/protocol/route/QueueData.java | 16 +- .../common/utils/NameServerAddressUtils.java | 12 +- .../rocketmq/common/filter/FilterAPITest.java | 2 +- .../common/protocol/route/TopicRouteDataTest.java | 4 +- .../common/utils/NameServerAddressUtilsTest.java | 59 ++++ distribution/LICENSE-BIN | 2 +- distribution/NOTICE-BIN | 2 +- distribution/bin/dledger/fast-try.sh | 24 +- distribution/bin/runbroker.cmd | 2 +- distribution/bin/runserver.cmd | 2 +- distribution/bin/runserver.sh | 4 +- distribution/pom.xml | 2 +- docs/cn/RocketMQ_Example.md | 2 +- docs/cn/concept.md | 2 +- docs/cn/design.md | 2 +- docs/cn/image/rocketmq_architecture_1.png | Bin 377784 -> 89290 bytes docs/cn/image/rocketmq_architecture_3.png | Bin 61421 -> 106758 bytes docs/cn/operation.md | 2 +- docs/cn/rpc_request.md | 2 +- docs/en/image/rocketmq_architecture_1.png | Bin 46292 -> 89290 bytes docs/en/image/rocketmq_architecture_3.png | Bin 61421 -> 106758 bytes example/pom.xml | 12 +- .../rocketmq/example/benchmark/Consumer.java | 4 +- .../rocketmq/example/benchmark/Producer.java | 70 ++++- .../rocketmq/example/ordermessage/Producer.java | 8 +- .../example/tracemessage/OpenTracingProducer.java | 68 +++++ .../tracemessage/OpenTracingPushConsumer.java | 71 +++++ .../OpenTracingTransactionProducer.java | 86 ++++++ filter/pom.xml | 2 +- .../rocketmq/filter/parser/SimpleCharStream.java | 8 +- logappender/pom.xml | 2 +- logging/pom.xml | 2 +- .../org/apache/rocketmq/logging/inner/Level.java | 1 - .../apache/rocketmq/logging/inner/SysLogger.java | 4 +- namesrv/pom.xml | 2 +- .../namesrv/processor/DefaultRequestProcessor.java | 5 + .../namesrv/routeinfo/RouteInfoManager.java | 10 +- openmessaging/pom.xml | 2 +- pom.xml | 25 +- remoting/pom.xml | 7 +- .../rocketmq/remoting/common/RemotingUtil.java | 18 ++ .../remoting/netty/NettyRemotingClient.java | 6 +- .../apache/rocketmq/remoting/netty/TlsHelper.java | 2 +- .../remoting/netty/NettyRemotingAbstractTest.java | 4 +- .../remoting/netty/NettyRemotingClientTest.java | 1 - srvutil/pom.xml | 2 +- store/pom.xml | 2 +- .../apache/rocketmq/store/DefaultMessageStore.java | 9 +- .../rocketmq/store/config/MessageStoreConfig.java | 10 + .../rocketmq/store/dledger/DLedgerCommitLog.java | 58 ++-- .../org/apache/rocketmq/store/ha/HAService.java | 7 + .../store/schedule/ScheduleMessageService.java | 7 + .../store/DefaultMessageStoreShutDownTest.java | 7 +- .../rocketmq/store/DefaultMessageStoreTest.java | 4 +- .../store/schedule/ScheduleMessageServiceTest.java | 11 + test/pom.xml | 2 +- .../org/apache/rocketmq/test/util/FileUtil.java | 2 +- .../java/org/apache/rocketmq/test/util/MQWait.java | 2 +- .../org/apache/rocketmq/test/util/RandomUtil.java | 10 +- .../org/apache/rocketmq/test/util/RandomUtils.java | 8 +- .../org/apache/rocketmq/test/util/VerifyUtils.java | 2 +- .../data/collect/impl/ListDataCollectorImpl.java | 6 +- .../test/client/consumer/tag/MulTagSubIT.java | 6 +- .../consumer/tag/TagMessageWithMulConsumerIT.java | 6 +- test/src/test/resources/log4j.xml | 2 +- tools/pom.xml | 2 +- .../rocketmq/tools/admin/DefaultMQAdminExt.java | 19 +- .../tools/admin/DefaultMQAdminExtImpl.java | 21 +- .../apache/rocketmq/tools/admin/MQAdminExt.java | 3 + .../command/cluster/CLusterSendMsgRTCommand.java | 2 +- .../consumer/ConsumerProgressSubCommand.java | 64 +++-- .../consumer/DeleteSubscriptionGroupCommand.java | 13 +- .../message/QueryMsgByUniqueKeySubCommand.java | 137 ++++----- .../message/QueryMsgTraceByIdSubCommand.java | 68 ++--- .../tools/command/topic/TopicRouteSubCommand.java | 52 +++- .../command/topic/UpdateTopicPermSubCommand.java | 2 +- 158 files changed, 2608 insertions(+), 1076 deletions(-)
