You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by vo...@apache.org on 2019/10/12 05:38:39 UTC
[rocketmq] branch master updated (83b15b8 -> 1aa629e)
This is an automated email from the ASF dual-hosted git repository.
vongosling pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq.git.
omit 83b15b8 Merge branch 'master' of https://github.com/apache/rocketmq
omit 2c414fa Merge remote-tracking branch 'origin/release-4.5.2'
omit 5e33f31 Merge branch 'master' of https://github.com/apache/rocketmq
omit d63678d [maven-release-plugin] prepare release rocketmq-all-4.5.2
omit 3fcc038 Fix the wrong package name
omit c95a109 Minor polish
omit 0f3b492 change the MQVersion variable to rocketmq 4.5.2 version;
omit 4eab2d4 Cherry-pick urgent PR from master to develop (#1353)
omit b7b9f1e Merge branch 'develop' of github.com:apache/rocketmq into develop
omit 713bb98 Refactor the protection logic when pulling
omit 7ac5ad3 fix /dev/shm not found on some OSs (#1345)
omit e1b9a32 Update concept.md (#1319)
omit 57e2959 fixed the text description in chinese doc (#1339)
omit b39031a [ISSUE #1082] Fix disconnection of HA (#1083)
omit ae9228d Minor Typo fix (#860)
omit 888e737 Polish the comment (#1107)
omit 5ccd01c Remove the duplicate content
omit 8d16798 Update DLedgerCommitLog.java (#1145)
omit 2ea1ca6 Replace PermSize with MetaspaceSize, details see http://openjdk.java.net/jeps/122
omit 9b0d037 Merge branch 'develop' of github.com:apache/rocketmq into develop
omit 664e067 Remove the useless files
omit be7c6dd [ISSUE #1308] Fix some spelling errors of method names. (#1307)
omit 6e7df55 Typo fix and some other polish
omit d4c2608 Refactoring the method name of checking directybuffer pool available numbers
omit c40cdf0 Add RPCHook construct method for MQPullConsumerScheduleService (#1314)
omit 9226292 Enhance: share netty handler (#635)
omit 5b29b73 Set auto commit (#914)
omit 92ec70b [ISSUE #1290] Acl IP Address Matching Range enhancement
omit d66243c [ISSUE #598] Enhance transaction by putting messages that exceed max check times to system topic (#633)
omit ea88c4b Delay plant log appender in client loggger (#1266)
omit bf2a7e5 fix typo (#1260)
omit ac7b16d [ISSUE #1241]optimize the codes for issue that Suggestion about the third part dependency of the RocketMQ client. (#1264)
omit a5d34dd Merge pull request #1257 from apache/enchanced_acl
omit d1db4a1 [ISSUE #1156]fix too many files with unapproved license issues;
omit 3adbca9 [ISSUE #1156]fix failure test cases for acl mqadmin command;
omit 18601ec Merge remote-tracking branch 'origin/develop' into enchanced_acl
omit a2165d8 [ISSUE #1156]new mqadmin API for ACL configuration (#1217)
omit a7e77d2 modify exception declaration
omit 38a4e4b Update best_practice.md
omit 21b64c6 Update NOTICE
omit 21588c2 Update copyright year
omit 9c60f2f [RIP-9] Commit docs Example_OpenMessaging.md (#797)
omit e1fa99a Update README.md
omit 918a82a Update issue_template.md
omit cd473fe [FIX] Travis-CI Java 8 building environments. (#1256)
omit e9bc366 fix typo (#1232)
omit c409c35 FIX: HmacSHA1 not found if JAVA_HOME set to JRE (#1140)
omit 6c5fc49 Add namespace support for transaction message (#1254)
omit 5e6c21f Merge pull request #1235 from githublaohu/travis
omit efefbaa trusty
omit c2f7503 test jdk9
omit c9d6a08 changge travis
omit 0378667 changge travis
omit 477a391 1
omit 8126cfa change travis.yml
omit 52005ae [maven-release-plugin] prepare for next development iteration
This update removed existing revisions from the reference, leaving the
reference pointing at a previous point in the repository history.
* -- * -- N refs/heads/master (1aa629e)
\
O -- O -- O (83b15b8)
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
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 +-
...sionManager.java => PlainPermissionLoader.java} | 282 +++++++--------------
.../acl/plain/RemoteAddressStrategyFactory.java | 4 +-
.../apache/rocketmq/acl/common/AclUtilsTest.java | 73 +-----
.../acl/plain/PlainAccessValidatorTest.java | 264 -------------------
...gerTest.java => PlainPermissionLoaderTest.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 | 40 ---
.../header/GetBrokerAclConfigResponseHeader.java | 71 ------
.../ResumeCheckHalfMessageRequestHeader.java | 45 ----
.../UpdateGlobalWhiteAddrsConfigRequestHeader.java | 39 ---
.../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 +--
.../bin/mqadmin.xml | 38 +--
.../bin/mqbroker.xml | 40 +--
.../bin/mqnamesrv.xml | 40 +--
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 | 38 ---
.../acl/DeleteAccessConfigSubCommandTest.java | 39 ---
.../acl/UpdateAccessConfigSubCommandTest.java | 89 -------
.../acl/UpdateGlobalWhiteAddrSubCommandTest.java | 39 ---
.../message/QueryMsgByUniqueKeySubCommandTest.java | 15 --
.../command/topic/UpdateTopicSubCommandTest.java | 2 +
133 files changed, 491 insertions(+), 3536 deletions(-)
delete mode 100644 acl/src/main/java/org/apache/rocketmq/acl/common/AclConstants.java
rename acl/src/main/java/org/apache/rocketmq/acl/plain/{PlainPermissionManager.java => PlainPermissionLoader.java} (53%)
rename acl/src/test/java/org/apache/rocketmq/acl/plain/{PlainPermissionManagerTest.java => PlainPermissionLoaderTest.java} (75%)
delete mode 100644 acl/src/test/resources/conf/plain_acl_correct.yml
delete mode 100644 acl/src/test/resources/conf/plain_acl_delete.yml
delete mode 100644 acl/src/test/resources/conf/plain_acl_global_white_addrs.yml
delete mode 100644 acl/src/test/resources/conf/plain_acl_update_create.yml
delete mode 100644 acl/src/test/resources/conf/plain_acl_with_no_accouts.yml
delete mode 100644 broker/src/test/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessorTest.java
delete mode 100644 common/src/main/java/org/apache/rocketmq/common/PlainAccessConfig.java
delete mode 100644 common/src/main/java/org/apache/rocketmq/common/protocol/body/ClusterAclVersionInfo.java
delete mode 100644 common/src/main/java/org/apache/rocketmq/common/protocol/header/CreateAccessConfigRequestHeader.java
delete mode 100644 common/src/main/java/org/apache/rocketmq/common/protocol/header/DeleteAccessConfigRequestHeader.java
delete mode 100644 common/src/main/java/org/apache/rocketmq/common/protocol/header/GetBrokerAclConfigResponseHeader.java
delete mode 100644 common/src/main/java/org/apache/rocketmq/common/protocol/header/ResumeCheckHalfMessageRequestHeader.java
delete mode 100644 common/src/main/java/org/apache/rocketmq/common/protocol/header/UpdateGlobalWhiteAddrsConfigRequestHeader.java
copy store/src/test/resources/logback-test.xml => distribution/bin/mqadmin.xml (55%)
copy store/src/test/resources/logback-test.xml => distribution/bin/mqbroker.xml (57%)
copy store/src/test/resources/logback-test.xml => distribution/bin/mqnamesrv.xml (57%)
delete mode 100644 tools/src/main/java/org/apache/rocketmq/tools/command/acl/ClusterAclConfigVersionListSubCommand.java
delete mode 100644 tools/src/main/java/org/apache/rocketmq/tools/command/acl/DeleteAccessConfigSubCommand.java
delete mode 100644 tools/src/main/java/org/apache/rocketmq/tools/command/acl/UpdateAccessConfigSubCommand.java
delete mode 100644 tools/src/main/java/org/apache/rocketmq/tools/command/acl/UpdateGlobalWhiteAddrSubCommand.java
delete mode 100644 tools/src/test/java/org/apache/rocketmq/tools/command/acl/ClusterAclConfigVersionListSubCommandTest.java
delete mode 100644 tools/src/test/java/org/apache/rocketmq/tools/command/acl/DeleteAccessConfigSubCommandTest.java
delete mode 100644 tools/src/test/java/org/apache/rocketmq/tools/command/acl/UpdateAccessConfigSubCommandTest.java
delete mode 100644 tools/src/test/java/org/apache/rocketmq/tools/command/acl/UpdateGlobalWhiteAddrSubCommandTest.java