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:52 UTC
[rocketmq] branch develop updated (28e4ac5 -> 306dcbb)
This is an automated email from the ASF dual-hosted git repository.
dongeforever pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git.
from 28e4ac5 add concept.md
add e04db85 I have finished developing the new feature for the message track #525 initially.
add 47556d6 I have already fix my code as suggestion.Please help to review them.[ISSUE #525].
add c50ada6 Merge pull request #597 from zongtanghu/develop
add cde6f40 [ISSUE #525] Support the message track,these committed codes have supported trace_topic name value Configurable by users.
add d480c81 [ISSUE #525] Support the message track,add the test case to increase code coverage.
add d572ffa Merge pull request #600 from zongtanghu/msg_track
add 9e0021d acl-plug rudimentary model
add 7a03020 accomplish
add 994e29d add unit test
add 62e65d6 ad unit test
add 77b9bc0 solve conflict
add 7c2b40c save
add 693243e finishing
add 94f36e2 slove rat exception
add a1a4616 slove rat exception
add 1e3c184 clear
add f2dcde9 clean
add da09320 clean Attention: delete line 37 of the MixAllTest.java
add 3aa4359 CI No environment
add a3b9480 CI No environment
add 81560c1 CI No environment
add d360f8b CI No environment 1
add b5cf8bc CI No environment 2
add eebb299 CI No environment 3
add bd6f34d CI No environment 3
add f691013 CI No environment 4
add 45343af CI No environment 5
add eeab571 CI no environment 6
add e2c3eaa CI no environment
add dba3bad CI no environment 7
add d6d1583 CI no environment 9
add 56f81dd CI no environment 9
add 4915871 Expose the rpc hook
add aea7461 Merge branch 'feature_acl' into develop-acl
add 76ab7bd Merge pull request #485 from githublaohu/develop-acl
add aeea021 Draft the rpc hook and access validator plugin mechanism
add 74f4213 arrange
add c629700 clean
add 212d247 clean
add d23d2f7 clean
add 9440371 add acl use example. AclClient.java
add 11d3df6 add acl use example. AclClient.java
add 2d4cda2 Merge pull request #519 from githublaohu/feature_acl
add 2a93a9b Polish acl
add b3aabd4 clean
add 1d57607 clean
add 48c51f7 clean
add 65bd9bf issue
add ceaa64b tools acl
add 5503cff tools acl
add 81c71c2 admin
add fb60683 admin
add b11ccc5 admin
add 760c24c Merge pull request #554 from githublaohu/feature_acl
add 5d253f5 Add signature and redesign the permission graph
add 87d8599 Rename some files in acl
add 23a24c4 Seamless cloud
add 020f4b4 clean code
add 1f69da0 Merge pull request #595 from githublaohu/feature_acl
add cb46a66 Add notes
add e3d38d7 Rename and polish permission loader
add c127438 handle TODO
add 5b640be Merge pull request #606 from githublaohu/feature_acl
add 1594dc9 [ISSUE#403]fix some bugs and Optimization code for rocketmq's acl feature.
add 1dca088 Merge pull request #628 from zongtanghu/feature_acl
add 7a48d37 [ISSUE#403] add the conf/plain_acl.yml file for acl_feature.
add 62fbeeb [ISSUE#403]adjust AclClient codes for rocketmq's acl feature and Ignore a unit test.
add 3c3c5ef [ISSUE#403] remove the unit test.
add 0472618 Merge pull request #634 from zongtanghu/feature_acl
add 459b246 [ISSUE#403] fix some bugs and Optimization code for rocketmq's acl feature. (#632)
add 0bb40f9 [ISSUE#403] add some test case,increasing code coverage (#636)
add 4250af6 Merge branch 'feature_acl' into msg_track
add 5f66424 [ISSUE#525]add aclClient PRCHook for message track (#638)
add b8cb82f Rename tracktrace to trace, and polish the package hierarchy
add 06da104 [ISSUE#525]restructure and optimize codes for message track (#645)
add 1a80c5b Trivial pilishment for acl and msg_trace
add be83a9a Polish acl names
add 10d84bb Polish the watch test
add 9452575 Refine the interface for msg_trace
add 80d12dd [ISSUE#525]add a switch variable(traceTopicEnable) for making msg trace worked which is decided by users and rename enableAcl flag variable to keep naming specification,such as clusterTopicEnable.
add 8afd3bf Merge pull request #649 from zongtanghu/msg_track
add 180a7db [ISSUE#403] fix acl config file watch bug,clean and optimize the codes for acl feature. (#651)
add 6263fb0 Resolve the conficts in readme
add ea8d517 Merge develop
add 691b712 [ISSUE#662]capitalizing the first letter in comments and removing the unless comments for acl and msg trace feature codes. (#669)
add 6574b69 Remove the log when get none remote address strategy
new 306dcbb Merge pull request #662 from apache/msg_track
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 1 +
README.md | 1 -
acl/pom.xml | 74 ++++
.../org/apache/rocketmq/acl/AccessResource.java | 4 +-
.../org/apache/rocketmq/acl/AccessValidator.java | 21 +-
.../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 | 7 +-
.../rocketmq/acl/plain/PlainAccessResource.java | 201 +++++++++++
.../rocketmq/acl/plain/PlainAccessValidator.java | 130 +++++++
.../rocketmq/acl/plain/PlainPermissionLoader.java | 300 ++++++++++++++++
.../rocketmq/acl/plain/RemoteAddressStrategy.java | 5 +-
.../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 ++++++++++++
.../src/test/resources/conf/plain_acl.yml | 36 +-
.../src/test/resources/conf/plain_acl_null.yml | 10 +-
.../test/resources/conf/watch/plain_acl_watch.yml | 17 +-
{store => acl}/src/test/resources/logback-test.xml | 5 +-
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 | 12 +-
.../apache/rocketmq/client/trace/TraceContext.java | 136 ++++++++
.../rocketmq/client/trace/TraceDataEncoder.java | 173 +++++++++
.../TraceDispatcher.java} | 34 +-
.../TraceDispatcherType.java} | 7 +-
.../rocketmq/client/trace/TraceTransferBean.java | 27 +-
.../MQAdminExtInner.java => trace/TraceType.java} | 8 +-
.../trace/hook/ConsumeMessageTraceHookImpl.java | 113 ++++++
.../trace/hook/SendMessageTraceHookImpl.java | 97 ++++++
.../DefaultMQConsumerWithTraceTest.java} | 212 +++++++-----
.../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 +-
...broker-a.properties => broker-trace.properties} | 4 +-
distribution/conf/{broker.conf => plain_acl.yml} | 32 +-
distribution/conf/{broker.conf => tools.yml} | 11 +-
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, 5020 insertions(+), 279 deletions(-)
create mode 100644 acl/pom.xml
copy client/src/main/java/org/apache/rocketmq/client/admin/MQAdminExtInner.java => acl/src/main/java/org/apache/rocketmq/acl/AccessResource.java (91%)
copy remoting/src/main/java/org/apache/rocketmq/remoting/RPCHook.java => acl/src/main/java/org/apache/rocketmq/acl/AccessValidator.java (62%)
create mode 100644 acl/src/main/java/org/apache/rocketmq/acl/common/AclClientRPCHook.java
create mode 100644 acl/src/main/java/org/apache/rocketmq/acl/common/AclException.java
create mode 100644 acl/src/main/java/org/apache/rocketmq/acl/common/AclSigner.java
create mode 100644 acl/src/main/java/org/apache/rocketmq/acl/common/AclUtils.java
create mode 100644 acl/src/main/java/org/apache/rocketmq/acl/common/Permission.java
create mode 100644 acl/src/main/java/org/apache/rocketmq/acl/common/SessionCredentials.java
copy client/src/main/java/org/apache/rocketmq/client/admin/MQAdminExtInner.java => acl/src/main/java/org/apache/rocketmq/acl/common/SigningAlgorithm.java (87%)
create mode 100644 acl/src/main/java/org/apache/rocketmq/acl/plain/PlainAccessResource.java
create mode 100644 acl/src/main/java/org/apache/rocketmq/acl/plain/PlainAccessValidator.java
create mode 100644 acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionLoader.java
copy client/src/main/java/org/apache/rocketmq/client/admin/MQAdminExtInner.java => acl/src/main/java/org/apache/rocketmq/acl/plain/RemoteAddressStrategy.java (85%)
create mode 100644 acl/src/main/java/org/apache/rocketmq/acl/plain/RemoteAddressStrategyFactory.java
copy common/src/test/java/org/apache/rocketmq/common/BrokerConfigTest.java => acl/src/test/java/org/apache/rocketmq/acl/common/AclSignerTest.java (69%)
create mode 100644 acl/src/test/java/org/apache/rocketmq/acl/common/AclUtilsTest.java
create mode 100644 acl/src/test/java/org/apache/rocketmq/acl/common/PermissionTest.java
create mode 100644 acl/src/test/java/org/apache/rocketmq/acl/common/SessionCredentialsTest.java
create mode 100644 acl/src/test/java/org/apache/rocketmq/acl/plain/PlainAccessValidatorTest.java
create mode 100644 acl/src/test/java/org/apache/rocketmq/acl/plain/PlainPermissionLoaderTest.java
create mode 100644 acl/src/test/java/org/apache/rocketmq/acl/plain/RemoteAddressStrategyTest.java
copy distribution/conf/broker.conf => acl/src/test/resources/conf/plain_acl.yml (59%)
copy distribution/conf/broker.conf => acl/src/test/resources/conf/plain_acl_null.yml (82%)
copy distribution/conf/broker.conf => acl/src/test/resources/conf/watch/plain_acl_watch.yml (77%)
copy {store => acl}/src/test/resources/logback-test.xml (92%)
create mode 100644 broker/src/main/resources/META-INF/service/org.apache.rocketmq.acl.AccessValidator
create mode 100644 broker/src/test/java/org/apache/rocketmq/broker/pagecache/ManyMessageTransferTest.java
create mode 100644 broker/src/test/java/org/apache/rocketmq/broker/pagecache/OneMessageTransferTest.java
create mode 100644 broker/src/test/resources/META-INF/service/org.apache.rocketmq.acl.AccessValidator
create mode 100644 client/src/main/java/org/apache/rocketmq/client/trace/AsyncTraceDispatcher.java
create mode 100644 client/src/main/java/org/apache/rocketmq/client/trace/TraceBean.java
copy broker/src/main/java/org/apache/rocketmq/broker/mqtrace/ConsumeMessageHook.java => client/src/main/java/org/apache/rocketmq/client/trace/TraceConstants.java (70%)
create mode 100644 client/src/main/java/org/apache/rocketmq/client/trace/TraceContext.java
create mode 100644 client/src/main/java/org/apache/rocketmq/client/trace/TraceDataEncoder.java
copy client/src/main/java/org/apache/rocketmq/client/{hook/CheckForbiddenHook.java => trace/TraceDispatcher.java} (59%)
copy client/src/main/java/org/apache/rocketmq/client/{admin/MQAdminExtInner.java => trace/TraceDispatcherType.java} (88%)
copy common/src/main/java/org/apache/rocketmq/common/protocol/body/LockBatchResponseBody.java => client/src/main/java/org/apache/rocketmq/client/trace/TraceTransferBean.java (63%)
copy client/src/main/java/org/apache/rocketmq/client/{admin/MQAdminExtInner.java => trace/TraceType.java} (88%)
create mode 100644 client/src/main/java/org/apache/rocketmq/client/trace/hook/ConsumeMessageTraceHookImpl.java
create mode 100644 client/src/main/java/org/apache/rocketmq/client/trace/hook/SendMessageTraceHookImpl.java
copy client/src/test/java/org/apache/rocketmq/client/{consumer/DefaultMQPushConsumerTest.java => trace/DefaultMQConsumerWithTraceTest.java} (63%)
create mode 100644 client/src/test/java/org/apache/rocketmq/client/trace/DefaultMQProducerWithTraceTest.java
copy distribution/conf/2m-noslave/{broker-a.properties => broker-trace.properties} (97%)
copy distribution/conf/{broker.conf => plain_acl.yml} (61%)
copy distribution/conf/{broker.conf => tools.yml} (82%)
create mode 100644 example/src/main/java/org/apache/rocketmq/example/simple/AclClient.java
copy example/src/main/java/org/apache/rocketmq/example/{simple/Producer.java => tracemessage/TraceProducer.java} (94%)
copy example/src/main/java/org/apache/rocketmq/example/{simple/PushConsumer.java => tracemessage/TracePushConsumer.java} (86%)
[rocketmq] 01/01: Merge pull request #662 from apache/msg_track
Posted by do...@apache.org.
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(-)