You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by do...@apache.org on 2019/01/10 02:06:53 UTC
[rocketmq] 01/01: Merge pull request #662 from apache/msg_track
This is an automated email from the ASF dual-hosted git repository.
dongeforever pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit 306dcbb349dad865f4b3f028aa0ce87cc9a1f6ad
Merge: 28e4ac5 6574b69
Author: Zhendong Liu <zh...@yeah.net>
AuthorDate: Thu Jan 10 10:06:41 2019 +0800
Merge pull request #662 from apache/msg_track
Msg trace & Acl
.gitignore | 1 +
README.md | 1 -
acl/pom.xml | 74 ++++
.../org/apache/rocketmq/acl/AccessResource.java | 15 +-
.../org/apache/rocketmq/acl/AccessValidator.java | 28 +-
.../rocketmq/acl/common/AclClientRPCHook.java | 98 ++++++
.../apache/rocketmq/acl/common/AclException.java | 66 ++++
.../org/apache/rocketmq/acl/common/AclSigner.java | 88 +++++
.../org/apache/rocketmq/acl/common/AclUtils.java | 140 ++++++++
.../org/apache/rocketmq/acl/common/Permission.java | 96 +++++
.../rocketmq/acl/common/SessionCredentials.java | 163 +++++++++
.../rocketmq/acl/common/SigningAlgorithm.java | 18 +-
.../rocketmq/acl/plain/PlainAccessResource.java | 201 +++++++++++
.../rocketmq/acl/plain/PlainAccessValidator.java | 130 +++++++
.../rocketmq/acl/plain/PlainPermissionLoader.java | 300 ++++++++++++++++
.../rocketmq/acl/plain/RemoteAddressStrategy.java | 16 +-
.../acl/plain/RemoteAddressStrategyFactory.java | 180 ++++++++++
.../apache/rocketmq/acl/common/AclSignerTest.java | 18 +-
.../apache/rocketmq/acl/common/AclUtilsTest.java | 141 ++++++++
.../apache/rocketmq/acl/common/PermissionTest.java | 168 +++++++++
.../acl/common/SessionCredentialsTest.java | 91 +++++
.../acl/plain/PlainAccessValidatorTest.java | 270 +++++++++++++++
.../acl/plain/PlainPermissionLoaderTest.java | 275 +++++++++++++++
.../acl/plain/RemoteAddressStrategyTest.java | 218 ++++++++++++
acl/src/test/resources/conf/plain_acl.yml | 44 +++
acl/src/test/resources/conf/plain_acl_null.yml | 18 +
.../test/resources/conf/watch/plain_acl_watch.yml | 25 ++
acl/src/test/resources/logback-test.xml | 34 ++
broker/pom.xml | 34 +-
.../apache/rocketmq/broker/BrokerController.java | 49 +++
.../rocketmq/broker/topic/TopicConfigManager.java | 10 +
.../rocketmq/broker/util/ServiceProvider.java | 8 +
.../org.apache.rocketmq.acl.AccessValidator | 1 +
.../rocketmq/broker/BrokerControllerTest.java | 1 +
.../broker/pagecache/ManyMessageTransferTest.java | 64 ++++
.../broker/pagecache/OneMessageTransferTest.java | 53 +++
.../rocketmq/broker/util/ServiceProviderTest.java | 9 +
.../org.apache.rocketmq.acl.AccessValidator | 1 +
.../client/consumer/DefaultMQPushConsumer.java | 77 ++++-
.../client/producer/DefaultMQProducer.java | 76 +++-
.../client/trace/AsyncTraceDispatcher.java | 385 +++++++++++++++++++++
.../apache/rocketmq/client/trace/TraceBean.java | 144 ++++++++
.../rocketmq/client/trace/TraceConstants.java | 19 +-
.../apache/rocketmq/client/trace/TraceContext.java | 136 ++++++++
.../rocketmq/client/trace/TraceDataEncoder.java | 173 +++++++++
.../rocketmq/client/trace/TraceDispatcher.java | 40 ++-
.../rocketmq/client/trace/TraceDispatcherType.java | 18 +-
.../rocketmq/client/trace/TraceTransferBean.java | 32 +-
.../apache/rocketmq/client/trace/TraceType.java | 19 +-
.../trace/hook/ConsumeMessageTraceHookImpl.java | 113 ++++++
.../trace/hook/SendMessageTraceHookImpl.java | 97 ++++++
.../trace/DefaultMQConsumerWithTraceTest.java | 314 +++++++++++++++++
.../trace/DefaultMQProducerWithTraceTest.java | 226 ++++++++++++
.../org/apache/rocketmq/common/BrokerConfig.java | 55 ++-
.../java/org/apache/rocketmq/common/MixAll.java | 1 +
.../java/org/apache/rocketmq/common/UtilAll.java | 12 +
.../apache/rocketmq/common/BrokerConfigTest.java | 17 +
.../org/apache/rocketmq/common/MixAllTest.java | 3 +-
.../conf/2m-noslave/broker-trace.properties | 23 ++
distribution/conf/plain_acl.yml | 40 +++
distribution/conf/tools.yml | 19 +
example/pom.xml | 5 +
.../apache/rocketmq/example/simple/AclClient.java | 168 +++++++++
.../apache/rocketmq/example/simple/Producer.java | 1 -
.../rocketmq/example/simple/PullConsumer.java | 4 +-
.../rocketmq/example/simple/PullConsumerTest.java | 1 +
.../rocketmq/example/simple/PushConsumer.java | 4 +-
.../TraceProducer.java} | 8 +-
.../TracePushConsumer.java} | 15 +-
pom.xml | 25 +-
.../remoting/netty/NettyRemotingAbstract.java | 60 +++-
.../remoting/netty/NettyRemotingClient.java | 31 +-
.../remoting/netty/NettyRemotingServer.java | 13 +-
.../org/apache/rocketmq/test/base/BaseConf.java | 4 +
tools/pom.xml | 11 +-
.../rocketmq/tools/command/MQAdminStartup.java | 33 +-
76 files changed, 5359 insertions(+), 210 deletions(-)