This is an automated email from the ASF dual-hosted git repository. huzongtang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit 2c414fa58acecf9e60a440a238a08431aed5c654 Merge: 5e33f31 d63678d Author: huzongtang <[email protected]> AuthorDate: Fri Aug 9 22:30:38 2019 +0800 Merge remote-tracking branch 'origin/release-4.5.2' .travis.yml | 7 +- acl/pom.xml | 2 +- .../org/apache/rocketmq/acl/AccessValidator.java | 31 +++ .../apache/rocketmq/acl/common/AclConstants.java | 50 ++++ .../org/apache/rocketmq/acl/common/AclUtils.java | 34 ++- .../rocketmq/acl/plain/PlainAccessResource.java | 2 +- .../rocketmq/acl/plain/PlainAccessValidator.java | 28 +- ...sionLoader.java => PlainPermissionManager.java} | 282 ++++++++++++++------- .../acl/plain/RemoteAddressStrategyFactory.java | 4 +- .../apache/rocketmq/acl/common/AclUtilsTest.java | 73 +++++- .../acl/plain/PlainAccessValidatorTest.java | 264 +++++++++++++++++++ ...erTest.java => PlainPermissionManagerTest.java} | 93 +++---- .../acl/plain/RemoteAddressStrategyTest.java | 12 + acl/src/test/resources/conf/plain_acl_correct.yml | 39 +++ acl/src/test/resources/conf/plain_acl_delete.yml | 39 +++ .../conf/plain_acl_global_white_addrs.yml | 39 +++ .../resources/conf/plain_acl_update_create.yml | 39 +++ .../resources/conf/plain_acl_with_no_accouts.yml | 20 ++ broker/pom.xml | 2 +- .../apache/rocketmq/broker/BrokerController.java | 10 +- .../filter/CommitLogDispatcherCalcBitMap.java | 7 +- .../rocketmq/broker/latency/BrokerFastFailure.java | 4 - .../broker/processor/AdminBrokerProcessor.java | 219 +++++++++++++++- .../rocketmq/broker/topic/TopicConfigManager.java | 48 +++- .../AbstractTransactionalMessageCheckListener.java | 5 + .../DefaultTransactionalMessageCheckListener.java | 45 +++- .../broker/filter/MessageStoreWithFilterTest.java | 4 +- .../broker/processor/AdminBrokerProcessorTest.java | 125 +++++++++ ...faultTransactionalMessageCheckListenerTest.java | 48 +++- client/pom.xml | 2 +- .../java/org/apache/rocketmq/client/MQAdmin.java | 2 +- .../consumer/MQPullConsumerScheduleService.java | 8 +- .../rocketmq/client/impl/MQClientAPIImpl.java | 126 +++++++++ .../impl/consumer/DefaultMQPullConsumerImpl.java | 38 +-- .../client/impl/consumer/PullAPIWrapper.java | 2 +- .../apache/rocketmq/client/log/ClientLogger.java | 35 ++- .../client/producer/TransactionMQProducer.java | 1 + .../rocketmq/client/impl/MQClientAPIImplTest.java | 171 +++++++++++++ .../trace/DefaultMQConsumerWithTraceTest.java | 3 - common/pom.xml | 2 +- .../java/org/apache/rocketmq/common/MQVersion.java | 2 +- .../java/org/apache/rocketmq/common/MixAll.java | 1 + .../apache/rocketmq/common/PlainAccessConfig.java | 102 ++++++++ .../org/apache/rocketmq/common/ServiceThread.java | 4 +- .../java/org/apache/rocketmq/common/UtilAll.java | 38 ++- .../rocketmq/common/message/MessageBatch.java | 2 +- .../rocketmq/common/protocol/RequestCode.java | 13 + .../rocketmq/common/protocol/ResponseCode.java | 7 + .../protocol/body/ClusterAclVersionInfo.java | 64 +++++ .../header/CreateAccessConfigRequestHeader.java | 113 +++++++++ .../header/DeleteAccessConfigRequestHeader.java | 42 +-- .../header/GetBrokerAclConfigResponseHeader.java | 71 ++++++ .../ResumeCheckHalfMessageRequestHeader.java | 33 ++- .../UpdateGlobalWhiteAddrsConfigRequestHeader.java | 35 +-- .../rocketmq/common/stats/MomentStatsItem.java | 2 +- .../rocketmq/common/stats/MomentStatsItemSet.java | 2 +- .../apache/rocketmq/common/stats/StatsItem.java | 6 +- .../apache/rocketmq/common/stats/StatsItemSet.java | 6 +- .../rocketmq/common/sysflag/PullSysFlag.java | 2 +- .../protocol/QueryConsumeTimeSpanBodyTest.java | 4 +- .../common/protocol/route/TopicRouteDataTest.java | 2 +- distribution/benchmark/runclass.sh | 34 ++- distribution/bin/mqadmin.xml | 43 ---- distribution/bin/mqbroker.xml | 45 ---- distribution/bin/mqnamesrv.xml | 45 ---- distribution/bin/runbroker.sh | 30 ++- distribution/bin/runserver.sh | 33 ++- distribution/bin/tools.cmd | 6 +- distribution/bin/tools.sh | 4 +- distribution/pom.xml | 2 +- docs/cn/README.md | 4 +- docs/cn/acl/user_guide.md | 73 +++++- docs/cn/best_practice.md | 4 +- docs/cn/concept.md | 7 +- docs/en/Concept.md | 2 +- docs/en/Operations_Broker.md | 2 +- docs/en/architecture.md | 2 +- docs/en/best_practice.md | 2 +- example/pom.xml | 6 +- .../rocketmq/example/ordermessage/Consumer.java | 2 +- filter/pom.xml | 6 +- logappender/pom.xml | 2 +- logging/pom.xml | 2 +- namesrv/pom.xml | 2 +- openmessaging/pom.xml | 2 +- pom.xml | 6 +- remoting/pom.xml | 2 +- .../rocketmq/remoting/common/ServiceThread.java | 4 +- .../rocketmq/remoting/netty/NettyEncoder.java | 2 + .../remoting/netty/NettyRemotingServer.java | 28 +- .../remoting/netty/NettyRemotingAbstractTest.java | 17 ++ srvutil/pom.xml | 6 +- .../apache/rocketmq/srvutil/FileWatchService.java | 4 +- store/pom.xml | 2 +- .../rocketmq/store/AllocateMappedFileService.java | 14 +- .../java/org/apache/rocketmq/store/CommitLog.java | 24 +- .../apache/rocketmq/store/DefaultMessageStore.java | 26 +- .../java/org/apache/rocketmq/store/MappedFile.java | 11 +- .../rocketmq/store/SelectMappedBufferResult.java | 4 - .../apache/rocketmq/store/TransientStorePool.java | 4 +- .../rocketmq/store/config/MessageStoreConfig.java | 22 +- .../rocketmq/store/dledger/DLedgerCommitLog.java | 21 +- .../org/apache/rocketmq/store/ha/HAConnection.java | 10 +- .../org/apache/rocketmq/store/ha/HAService.java | 22 +- .../org/apache/rocketmq/store/index/IndexFile.java | 2 +- .../apache/rocketmq/store/AppendCallbackTest.java | 4 +- .../apache/rocketmq/store/BatchPutMessageTest.java | 4 +- .../apache/rocketmq/store/ConsumeQueueTest.java | 4 +- .../store/DefaultMessageStoreCleanFilesTest.java | 6 +- .../store/DefaultMessageStoreShutDownTest.java | 4 +- .../rocketmq/store/DefaultMessageStoreTest.java | 9 +- .../java/org/apache/rocketmq/store/HATest.java | 8 +- .../store/dledger/MessageStoreTestBase.java | 8 +- .../rocketmq/store/dledger/MixCommitlogTest.java | 6 +- .../store/schedule/ScheduleMessageServiceTest.java | 4 +- test/pom.xml | 2 +- .../rocketmq/test/base/IntegrationTestBase.java | 2 +- .../base/dledger/DLedgerProduceAndConsumeIT.java | 3 +- tools/pom.xml | 2 +- .../rocketmq/tools/admin/DefaultMQAdminExt.java | 37 +++ .../tools/admin/DefaultMQAdminExtImpl.java | 44 ++++ .../apache/rocketmq/tools/admin/MQAdminExt.java | 19 ++ .../rocketmq/tools/command/MQAdminStartup.java | 10 + .../acl/ClusterAclConfigVersionListSubCommand.java | 131 ++++++++++ .../command/acl/DeleteAccessConfigSubCommand.java | 106 ++++++++ .../command/acl/UpdateAccessConfigSubCommand.java | 185 ++++++++++++++ .../acl/UpdateGlobalWhiteAddrSubCommand.java | 101 ++++++++ ...ClusterAclConfigVersionListSubCommandTest.java} | 28 +- .../DeleteAccessConfigSubCommandTest.java} | 29 +-- .../acl/UpdateAccessConfigSubCommandTest.java | 89 +++++++ .../UpdateGlobalWhiteAddrSubCommandTest.java} | 29 +-- .../message/QueryMsgByUniqueKeySubCommandTest.java | 15 ++ .../command/topic/UpdateTopicSubCommandTest.java | 2 - 133 files changed, 3332 insertions(+), 666 deletions(-)
