You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by di...@apache.org on 2019/01/24 07:54:35 UTC
[rocketmq] branch master updated (f8a67ad -> 46ac065)
This is an automated email from the ASF dual-hosted git repository.
dinglei pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq.git.
from f8a67ad Update README.md
new 3c524c2 fix comment
new 3530b76 MQPullConsumer support MessageSelector
new 11bb267 Make tag type use 0 as subVersion
new 82a5961 Add integration test case
new ef91e94 To ignore localbin
new f27dc75 common model modify org.apache.rocketmq.common.constant.DBMsgConstants.MAX_BODY_SIZE value
new 5d3560d Fixed Transactional message will be lost under extreme condition
new 3482f94 Clean code, don't list the default config in JVM
new f177253 Modify the asynchronous send thread pool to a exclusive one
new 495a01b Remove unnecessary code in test case
new 7fd657f Format the precision output TPS
new d073c69 Update README.md
new 6bb6cff update the year info in NOTICE
new 0a31a7b Release semaphore when timeout
new b06074a Revert "Release semaphore when timeout"
new 9fe30e2 FixSemaphoreProblem
new 385c695 Merge pull request #611 from ymwneu/FixSemaphore
new d45fda4 Add docs
new 37b6dd0 Merge branch 'develop' of https://github.com/apache/rocketmq
new e5d2807 exclude docs folder when running apache-rat-plugin
new 5c46048 Merge pull request #641 from xiangwangcheng/exclude_docs_from_rat
new 5cf0d0a add architecture.md
new d41d813 Merge pull request #648 from hdchen/develop
new 28e4ac5 add concept.md
new e04db85 I have finished developing the new feature for the message track #525 initially.
new 47556d6 I have already fix my code as suggestion.Please help to review them.[ISSUE #525].
new c50ada6 Merge pull request #597 from zongtanghu/develop
new cde6f40 [ISSUE #525] Support the message track,these committed codes have supported trace_topic name value Configurable by users.
new d480c81 [ISSUE #525] Support the message track,add the test case to increase code coverage.
new d572ffa Merge pull request #600 from zongtanghu/msg_track
new 9e0021d acl-plug rudimentary model
new 7a03020 accomplish
new 994e29d add unit test
new 62e65d6 ad unit test
new 77b9bc0 solve conflict
new 7c2b40c save
new 693243e finishing
new 94f36e2 slove rat exception
new a1a4616 slove rat exception
new 1e3c184 clear
new f2dcde9 clean
new da09320 clean Attention: delete line 37 of the MixAllTest.java
new 3aa4359 CI No environment
new a3b9480 CI No environment
new 81560c1 CI No environment
new d360f8b CI No environment 1
new b5cf8bc CI No environment 2
new eebb299 CI No environment 3
new bd6f34d CI No environment 3
new f691013 CI No environment 4
new 45343af CI No environment 5
new eeab571 CI no environment 6
new e2c3eaa CI no environment
new dba3bad CI no environment 7
new d6d1583 CI no environment 9
new 56f81dd CI no environment 9
new 4915871 Expose the rpc hook
new aea7461 Merge branch 'feature_acl' into develop-acl
new 76ab7bd Merge pull request #485 from githublaohu/develop-acl
new aeea021 Draft the rpc hook and access validator plugin mechanism
new 74f4213 arrange
new c629700 clean
new 212d247 clean
new d23d2f7 clean
new 9440371 add acl use example. AclClient.java
new 11d3df6 add acl use example. AclClient.java
new 2d4cda2 Merge pull request #519 from githublaohu/feature_acl
new 2a93a9b Polish acl
new b3aabd4 clean
new 1d57607 clean
new 48c51f7 clean
new 65bd9bf issue
new ceaa64b tools acl
new 5503cff tools acl
new 81c71c2 admin
new fb60683 admin
new b11ccc5 admin
new 760c24c Merge pull request #554 from githublaohu/feature_acl
new 5d253f5 Add signature and redesign the permission graph
new 87d8599 Rename some files in acl
new 23a24c4 Seamless cloud
new 020f4b4 clean code
new 1f69da0 Merge pull request #595 from githublaohu/feature_acl
new cb46a66 Add notes
new e3d38d7 Rename and polish permission loader
new c127438 handle TODO
new 5b640be Merge pull request #606 from githublaohu/feature_acl
new 1594dc9 [ISSUE#403]fix some bugs and Optimization code for rocketmq's acl feature.
new 1dca088 Merge pull request #628 from zongtanghu/feature_acl
new 7a48d37 [ISSUE#403] add the conf/plain_acl.yml file for acl_feature.
new 62fbeeb [ISSUE#403]adjust AclClient codes for rocketmq's acl feature and Ignore a unit test.
new 3c3c5ef [ISSUE#403] remove the unit test.
new 0472618 Merge pull request #634 from zongtanghu/feature_acl
new 459b246 [ISSUE#403] fix some bugs and Optimization code for rocketmq's acl feature. (#632)
new 0bb40f9 [ISSUE#403] add some test case,increasing code coverage (#636)
new 4250af6 Merge branch 'feature_acl' into msg_track
new 5f66424 [ISSUE#525]add aclClient PRCHook for message track (#638)
new b8cb82f Rename tracktrace to trace, and polish the package hierarchy
new 06da104 [ISSUE#525]restructure and optimize codes for message track (#645)
new 1a80c5b Trivial pilishment for acl and msg_trace
new be83a9a Polish acl names
new 10d84bb Polish the watch test
new 9452575 Refine the interface for msg_trace
new 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.
new 8afd3bf Merge pull request #649 from zongtanghu/msg_track
new 180a7db [ISSUE#403] fix acl config file watch bug,clean and optimize the codes for acl feature. (#651)
new 6263fb0 Resolve the conficts in readme
new ea8d517 Merge develop
new 691b712 [ISSUE#662]capitalizing the first letter in comments and removing the unless comments for acl and msg trace feature codes. (#669)
new 6574b69 Remove the log when get none remote address strategy
new 306dcbb Merge pull request #662 from apache/msg_track
new 0767a9d 修复issue556 EpollEventLoopGroup启动失败的bug
new e7fcb28 Merge pull request #689 from Black-Mamba24/master
new eeb1407 fix bug: when producers send msg to multi clusters, only one cluster can receive message trace message (#694)
new 012723f Pre release 4.4.0
new f61fd5c [maven-release-plugin] prepare release rocketmq-all-4.4.0
new 46ac065 Merge remote-tracking branch 'origin/release-4.4.0'
The 695 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 | 4 +-
README.md | 1 -
acl/pom.xml | 72 ++++
.../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 | 32 +-
.../apache/rocketmq/broker/BrokerController.java | 49 +++
.../rocketmq/broker/topic/TopicConfigManager.java | 10 +
.../queue/TransactionalMessageServiceImpl.java | 37 +-
.../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/pom.xml | 2 +-
.../client/consumer/DefaultMQPullConsumer.java | 26 ++
.../client/consumer/DefaultMQPushConsumer.java | 77 +++-
.../rocketmq/client/consumer/MQPullConsumer.java | 47 +++
.../impl/consumer/DefaultMQPullConsumerImpl.java | 98 ++++--
.../client/impl/consumer/PullAPIWrapper.java | 28 --
.../client/impl/factory/MQClientInstance.java | 13 +
.../impl/producer/DefaultMQProducerImpl.java | 36 +-
.../client/producer/DefaultMQProducer.java | 86 ++++-
.../client/trace/AsyncTraceDispatcher.java | 386 +++++++++++++++++++++
.../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 ++++++
.../client/producer/DefaultMQProducerTest.java | 13 +-
.../DefaultMQConsumerWithTraceTest.java} | 212 ++++++-----
.../trace/DefaultMQProducerWithTraceTest.java | 213 ++++++++++++
common/pom.xml | 2 +-
.../org/apache/rocketmq/common/BrokerConfig.java | 55 ++-
.../java/org/apache/rocketmq/common/MQVersion.java | 2 +-
.../java/org/apache/rocketmq/common/MixAll.java | 1 +
.../java/org/apache/rocketmq/common/UtilAll.java | 12 +
.../rocketmq/common/constant/DBMsgConstants.java | 2 +-
.../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 +-
distribution/pom.xml | 2 +-
docs/cn/architecture.md | 46 +++
docs/cn/concept.md | 39 +++
docs/cn/image/rocketmq_architecture_1.png | Bin 0 -> 46292 bytes
docs/cn/image/rocketmq_architecture_2.png | Bin 0 -> 18500 bytes
docs/cn/image/rocketmq_architecture_3.png | Bin 0 -> 61421 bytes
docs/cn/index.md | 0
docs/en/index.md | 0
example/pom.xml | 9 +-
.../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 +-
filter/pom.xml | 2 +-
logappender/pom.xml | 2 +-
logging/pom.xml | 2 +-
namesrv/pom.xml | 2 +-
openmessaging/pom.xml | 2 +-
pom.xml | 25 +-
remoting/pom.xml | 2 +-
.../remoting/netty/NettyRemotingAbstract.java | 60 +++-
.../remoting/netty/NettyRemotingClient.java | 31 +-
.../remoting/netty/NettyRemotingServer.java | 38 +-
srvutil/pom.xml | 2 +-
store/pom.xml | 2 +-
.../rocketmq/store/config/MessageStoreConfig.java | 2 +-
test/pom.xml | 2 +-
.../org/apache/rocketmq/test/base/BaseConf.java | 4 +
.../test/client/consumer/filter/SqlFilterIT.java | 75 +++-
tools/pom.xml | 10 +-
.../rocketmq/tools/command/MQAdminStartup.java | 33 +-
.../consumer/ConsumerProgressSubCommand.java | 2 +-
108 files changed, 5413 insertions(+), 401 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 docs/cn/architecture.md
create mode 100644 docs/cn/concept.md
create mode 100644 docs/cn/image/rocketmq_architecture_1.png
create mode 100644 docs/cn/image/rocketmq_architecture_2.png
create mode 100644 docs/cn/image/rocketmq_architecture_3.png
create mode 100644 docs/cn/index.md
create mode 100644 docs/en/index.md
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%)