This is an automated email from the ASF dual-hosted git repository.
huzongtang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq.git.
from 092a639 文档排版错误 (#1320)
add 34b085d delete blank chart line
new 5e33f31 Merge branch 'master' of https://github.com/apache/rocketmq
add 52005ae [maven-release-plugin] prepare for next development iteration
add a2165d8 [ISSUE #1156]new mqadmin API for ACL configuration (#1217)
add 8126cfa change travis.yml
add 477a391 1
add 0378667 changge travis
add c9d6a08 changge travis
add c2f7503 test jdk9
add efefbaa trusty
add 5e6c21f Merge pull request #1235 from githublaohu/travis
add 6c5fc49 Add namespace support for transaction message (#1254)
add c409c35 FIX: HmacSHA1 not found if JAVA_HOME set to JRE (#1140)
add e9bc366 fix typo (#1232)
add cd473fe [FIX] Travis-CI Java 8 building environments. (#1256)
add 918a82a Update issue_template.md
add e1fa99a Update README.md
add 9c60f2f [RIP-9] Commit docs Example_OpenMessaging.md (#797)
add 21588c2 Update copyright year
add 21b64c6 Update NOTICE
add 38a4e4b Update best_practice.md
add a7e77d2 modify exception declaration
add 18601ec Merge remote-tracking branch 'origin/develop' into
enchanced_acl
add 3adbca9 [ISSUE #1156]fix failure test cases for acl mqadmin command;
add d1db4a1 [ISSUE #1156]fix too many files with unapproved license
issues;
add a5d34dd Merge pull request #1257 from apache/enchanced_acl
add ac7b16d [ISSUE #1241]optimize the codes for issue that Suggestion
about the third part dependency of the RocketMQ client. (#1264)
add bf2a7e5 fix typo (#1260)
add ea88c4b Delay plant log appender in client loggger (#1266)
add d66243c [ISSUE #598] Enhance transaction by putting messages that
exceed max check times to system topic (#633)
add 92ec70b [ISSUE #1290] Acl IP Address Matching Range enhancement
add 5b29b73 Set auto commit (#914)
add 9226292 Enhance: share netty handler (#635)
add c40cdf0 Add RPCHook construct method for
MQPullConsumerScheduleService (#1314)
add d4c2608 Refactoring the method name of checking directybuffer pool
available numbers
add 6e7df55 Typo fix and some other polish
add 664e067 Remove the useless files
add be7c6dd [ISSUE #1308] Fix some spelling errors of method names.
(#1307)
add 9b0d037 Merge branch 'develop' of github.com:apache/rocketmq into
develop
add 2ea1ca6 Replace PermSize with MetaspaceSize, details see
http://openjdk.java.net/jeps/122
add 8d16798 Update DLedgerCommitLog.java (#1145)
add 5ccd01c Remove the duplicate content
add 888e737 Polish the comment (#1107)
add ae9228d Minor Typo fix (#860)
add b39031a [ISSUE #1082] Fix disconnection of HA (#1083)
add 713bb98 Refactor the protection logic when pulling
add 57e2959 fixed the text description in chinese doc (#1339)
add e1b9a32 Update concept.md (#1319)
add 7ac5ad3 fix /dev/shm not found on some OSs (#1345)
add b7b9f1e Merge branch 'develop' of github.com:apache/rocketmq into
develop
add 4eab2d4 Cherry-pick urgent PR from master to develop (#1353)
add 0f3b492 change the MQVersion variable to rocketmq 4.5.2 version;
add c95a109 Minor polish
add 3fcc038 Fix the wrong package name
add d63678d [maven-release-plugin] prepare release rocketmq-all-4.5.2
new 2c414fa Merge remote-tracking branch 'origin/release-4.5.2'
The 2 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:
.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 +
.../conf/{plain_acl.yml => plain_acl_correct.yml} | 5 -
.../conf/{plain_acl.yml => plain_acl_delete.yml} | 5 -
...in_acl.yml => plain_acl_global_white_addrs.yml} | 5 -
.../{plain_acl.yml => plain_acl_update_create.yml} | 5 -
..._acl_null.yml => plain_acl_with_no_accouts.yml} | 4 +-
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 +
.../ClusterAclVersionInfo.java} | 30 +--
.../header/CreateAccessConfigRequestHeader.java | 113 +++++++++
...r.java => DeleteAccessConfigRequestHeader.java} | 17 +-
....java => GetBrokerAclConfigResponseHeader.java} | 31 +--
...va => ResumeCheckHalfMessageRequestHeader.java} | 20 +-
...UpdateGlobalWhiteAddrsConfigRequestHeader.java} | 17 +-
.../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 | 5 +-
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 ++++++++++
.../DeleteAccessConfigSubCommand.java} | 60 ++---
.../command/acl/UpdateAccessConfigSubCommand.java | 185 ++++++++++++++
.../UpdateGlobalWhiteAddrSubCommand.java} | 69 +++--
...ClusterAclConfigVersionListSubCommandTest.java} | 13 +-
.../DeleteAccessConfigSubCommandTest.java} | 15 +-
.../acl/UpdateAccessConfigSubCommandTest.java | 89 +++++++
.../UpdateGlobalWhiteAddrSubCommandTest.java} | 15 +-
.../message/QueryMsgByUniqueKeySubCommandTest.java | 15 ++
.../command/topic/UpdateTopicSubCommandTest.java | 2 -
133 files changed, 2875 insertions(+), 721 deletions(-)
create mode 100644
acl/src/main/java/org/apache/rocketmq/acl/common/AclConstants.java
rename
acl/src/main/java/org/apache/rocketmq/acl/plain/{PlainPermissionLoader.java =>
PlainPermissionManager.java} (53%)
rename
acl/src/test/java/org/apache/rocketmq/acl/plain/{PlainPermissionLoaderTest.java
=> PlainPermissionManagerTest.java} (75%)
copy acl/src/test/resources/conf/{plain_acl.yml => plain_acl_correct.yml} (92%)
copy acl/src/test/resources/conf/{plain_acl.yml => plain_acl_delete.yml} (92%)
copy acl/src/test/resources/conf/{plain_acl.yml =>
plain_acl_global_white_addrs.yml} (92%)
copy acl/src/test/resources/conf/{plain_acl.yml =>
plain_acl_update_create.yml} (92%)
copy acl/src/test/resources/conf/{plain_acl_null.yml =>
plain_acl_with_no_accouts.yml} (93%)
create mode 100644
broker/src/test/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessorTest.java
create mode 100644
common/src/main/java/org/apache/rocketmq/common/PlainAccessConfig.java
copy
common/src/main/java/org/apache/rocketmq/common/protocol/{header/namesrv/QueryDataVersionRequestHeader.java
=> body/ClusterAclVersionInfo.java} (69%)
create mode 100644
common/src/main/java/org/apache/rocketmq/common/protocol/header/CreateAccessConfigRequestHeader.java
copy
common/src/main/java/org/apache/rocketmq/common/protocol/header/{GetTopicsByClusterRequestHeader.java
=> DeleteAccessConfigRequestHeader.java} (77%)
copy
common/src/main/java/org/apache/rocketmq/common/protocol/header/{namesrv/QueryDataVersionRequestHeader.java
=> GetBrokerAclConfigResponseHeader.java} (81%)
copy
common/src/main/java/org/apache/rocketmq/common/protocol/header/{namesrv/GetKVConfigResponseHeader.java
=> ResumeCheckHalfMessageRequestHeader.java} (72%)
copy
common/src/main/java/org/apache/rocketmq/common/protocol/header/{GetConsumeStatsInBrokerHeader.java
=> UpdateGlobalWhiteAddrsConfigRequestHeader.java} (73%)
delete mode 100644 distribution/bin/mqadmin.xml
delete mode 100644 distribution/bin/mqbroker.xml
delete mode 100644 distribution/bin/mqnamesrv.xml
create mode 100644
tools/src/main/java/org/apache/rocketmq/tools/command/acl/ClusterAclConfigVersionListSubCommand.java
copy
tools/src/main/java/org/apache/rocketmq/tools/command/{broker/UpdateBrokerConfigSubCommand.java
=> acl/DeleteAccessConfigSubCommand.java} (60%)
create mode 100644
tools/src/main/java/org/apache/rocketmq/tools/command/acl/UpdateAccessConfigSubCommand.java
copy
tools/src/main/java/org/apache/rocketmq/tools/command/{broker/UpdateBrokerConfigSubCommand.java
=> acl/UpdateGlobalWhiteAddrSubCommand.java} (57%)
copy
tools/src/test/java/org/apache/rocketmq/tools/command/{topic/TopicStatusSubCommandTest.java
=> acl/ClusterAclConfigVersionListSubCommandTest.java} (79%)
copy
tools/src/test/java/org/apache/rocketmq/tools/command/{topic/DeleteTopicSubCommandTest.java
=> acl/DeleteAccessConfigSubCommandTest.java} (79%)
create mode 100644
tools/src/test/java/org/apache/rocketmq/tools/command/acl/UpdateAccessConfigSubCommandTest.java
copy
tools/src/test/java/org/apache/rocketmq/tools/command/{topic/DeleteTopicSubCommandTest.java
=> acl/UpdateGlobalWhiteAddrSubCommandTest.java} (75%)
