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/03/14 11:10:32 UTC
[rocketmq] branch master updated (734834c -> 971fa8e)
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 734834c Merge branch 'develop'
new ccb934b Update Configuration_System.md
new 366d7f0 Merge pull request #1034 from jiangkuncs/develop
new 2758825 [RIP-9]Modify Design_Remoting.md
new eda0e64 [RIP-9] update Deployment.md in docs/en
new 058b4c7 Merge pull request #1029 from Stephenzho/develop
new 05c5fab [RIP-9] Update Deployment.md in RocketMQ
new 5dd62e3 [RIP-9] Changed'.For clusters of multiple NameServer' . For clusters of multiple NameServer
new bf4ac79 Merge pull request #1028 from pengbin7/develop
new 515bc35 Add dleger commitlog with tests
new 5f73002 Add role change handler for broker controller
new 456691b Add IT tests for dleger commitlog
new 1a2fe9f Test the committed pos for dleger
new dbc5987 Fix tests
new 29fb333 fix
new cc3f9f3 Fix check style
new b3ba266 Fix os pache cache busy problem
new d2cafcf Fix locktime and group
new aed6f0e Fix tests for dleger commitlog, add group check
new 5020f32 Add id for dleger commitlog
new cbbd6ff Polish role change logic
new 4137364 Remove non-existed brokerId of the same broker addr
new 84bd640 Reduce slave sync interval
new 5a19e6e Fix reput problem
new 0c69aca Get reput offset from logic queues
new 9342674 Polish maxPhysicOffset for logic queue
new ffc733a Polish log for reput offset
new 866e309 Make role change handler asynchronous
new b9ed0ab Fix tests
new 7b42909 Review code and fix
new f2bcae0 fix
new 3e9799b Use io.openmessaging instead
new d30d0e8 Polish DLedgerCommitlog, and rename dleger to dledger
new f8634b4 Divide old commitlog and dledger commitlog
new 77b252b Polish checkstyle
new b31c17f Load and recover for dledger commitlog
new 58496c2 Rename dleger to dledger
new 8f788c3 Add reputoffset test for dledger commitlog test
new ed31e74 Add tests for mixed commitlog test
new 927385b Enhance tests for mixed commitlog
new 44f696c Add deleting test for mixed commitlog
new 30028a1 Make ServiceThread be able to be restarted
new 9c8fa5e Catch service thread exception of scheduledMessage and transactionalMessage when changing role
new 235ac79 Polish checkstyle
new 415b38b Do not return flush_slave_timeout to client
new f8dd3f7 Fix import names
new 1276539 Add test for trucating consumequeue if the dledger commitlog is deleted
new 698ef2f Fix old ha service
new 38554a0 Polish ServiceThread to make inner thread private
new 43753d6 Polish makeStop for ServiceThread
new 1e358ae Annotate
new a50b733 Add tests for consume queue fall behind
new a90342e No need to change to slave
new 5ce20e8 Make sure the fallen behind node not to be leader
new 5bf113a Polish tests, separate ports, disable log, etc.
new 1c2cbfa Refresh the message store config to dledger config
new 55eda18 Fix style
new e149495 Fix the initial reput offset, according to the maxPhisicalPosInLogicQueue
new 3f0b0b2 Revise the reputoffset if it is smaller that minOffset of the commitlog
new 28a0906 Polish file reserved hours to 24 * 365 * 10 when disableDeleteDLedger
new 7e8c012 Fix typo
new 89c0668 Add example conf and bin for dledger
new 0d39569 Add docs
new d097acb Add cn deploy guide for rocketmq cluster
new 8cec194 Polish new line for docs
new 7574fde Update README.md
new 0586d57 Merge branch 'develop' into store_with_dledger
new cd4779e Do not send heartbeat for every pull request
new f3130c3 Polish pom to use dledger 0.1 from central repo
new 1bc1f22 Add copywright for some files
new e90d20d Merge pull request #1046 from apache/store_with_dledger
new 06eeaed [RIP-10]ConsumeMessageConcurrentlyServiceTest maybe effect other case,Ignore part test function
new 4d9fd18 update Configuration_System.md
new d95bca5 Merge pull request #1027 from JesseHu1520/develop
new 8497429 [RIP-9] Update Configuration_System.md
new f65f507 Merge pull request #1059 from runbird/develop
new 4abcb0b Number the titles of Configuration_Client.md
new a61e3a9 Merge pull request #1026 from zhanguohuang/develop
new 3dbe55f Update Configuration_System.md
new 5fc047d Update Configuration_System.md
new 6f17c8e Update Configuration_System.md
new 70367d5 Merge pull request #1016 from DreamsZM/develop
new 540dd7f Update Operations_Producer.md
new 59f3017 Merge pull request #1013 from yemyaidr/develop
new f426f4f format
new 4b12f83 Merge pull request #1010 from Veryfirefly/develop
new da32267 [RIP-9] Polish Operations_Trace.md
new 34eefee Merge pull request #1004 from liyangbing/develop
new 67182a4 Update Example_Orderly.md
new fd6c890 Merge pull request #1009 from HollisGW/develop
new b0d12ce update rocketmq/docs/en/Example_Delay.md, delete some punctuation character
new 576d674 Merge pull request #999 from nothingax/develop
new 3bf799c [RIP-9] update FAQ.md in RocketMQ docs/en
new 240357b [RIP-9] update Concept.md in RocketMQ docs/en
new f8b24a7 [RIP-9] update Concept.md and change '.' to ',' in RocketMQ docs/en
new 77c181b [RIP-9] Update Configuration_System.md in RocketMQ docs/en:some problems in grammer
new 62acf7c [RIP-9] update Concept.md in RocketMQ docs/en
new 17ae744 Merge pull request #998 from shudo1219/develop
new d45330c [RIP-9] update the title and delete cluster setup
new f9bd8ed Merge pull request #994 from Cicizz/develop
new 8b060ea remove "." behind the number in each title
new 3ef1d73 Merge pull request #990 from feishengCH/develop
new 65fe98b Modify English document
new 3043b05 Modify English document for Configuration_System.md
new 4edad4e Merge pull request #987 from hzfengjian/develop
new 036a9ce Update Operations_Producer.md
new 8b6a6e2 Merge pull request #1 from zengqhb/zengqhb-patch-1
new 91cb748 Merge pull request #982 from zengqhb/develop
new 3b01e89 delete useless image references and correct the description
new 15302bd Merge pull request #949 from itlangzi/develop
new 44f8c11 Modify English document for Example_Transaction.md
new eab78dd Merge pull request #981 from Lunaticf/develop
new b5a9423 Update Design_Store.md
new 3bbc3a7 Merge pull request #979 from Cloud-Leung/patch-1
new 3028bda Example_Delay.md
new 84552bd Merge pull request #1024 from hackjeremy/hackjeremy-patch-1
new d9f189c [RIP-9]remove "**" from headline and adjust some content formate
new 9633a1f modify (2)
new fe0e1c7 Merge pull request #1063 from yazong/develop
new 579254d [RIP-9] Modify the numbering style of the first paragraph
new 6355bc3 Merge pull request #1062 from ly641921791/develop
new ad0ceb7 [RIP-65] Delete chinese period in CLITools.md file
new 8b9971f Merge pull request #1018 from ox123/develop
new ce65b7b Update Configuration_System.md
new 4bbc2e4 Merge pull request #1008 from MoCha4J/develop
new 103aaa8 Delete the Introduction and underline
new 02bf908 [RIP-9]Delete the Introduction and underlines
new aa3d609 [RIP-9]Delete the Introduction and underlines
new 1ad3de8 [RIP-9]Delete the Introduction and underlines
new 94634fb Merge branch 'develop' into develop
new 756183a Merge pull request #1003 from dust6174/develop
new d7dd2a8 [RIP-78] update Example_Filter.md in RocketMQ docs/en
new 38ece0f [RIP-78] update Design_LoadBlancing.md in RocketMQ docs/en
new 084a941 [RIP-70] update Deployment.md in RocketMQ docs/en
new 09f8b9c Modify Deployment.md in RocketMQ docs/en
new 3c5e16b [RIP-78] update Example_Filter.md in RocketMQ docs/en
new 097d065 Merge pull request #1006 from slgshishen/develop
new c644ed2 Update Feature.md in RocketMQ/docs/en
new 00ab090 Merge pull request #996 from hellozepp/develop
new 161a457 Update Design_Filter.md
new de34ce7 Merge pull request #985 from SessionBest/develop
new 02e2abb [RIP-10] Add test cases for ConsumerRunningInfo (#923)
new a1d4ce0 [RIP-9](Operation) within deleted title(#1066)
new 5134a8e [PIR-10] add test for GroupList (#807)
new 0d8c0ba Update Design_Store.md
new cdacb29 Merge pull request #1071 from RickySongyz/develop
new a974ed2 [RIP-9] Modify the numbering style
new 0865945 Merge pull request #1070 from ly641921791/develop
new 5691bb6 Merge pull request #1 from apache/develop
new 8fa4711 Merge pull request #3 from apache/develop
new 8b8051f fix Design_Remoting.md issues no 103-105
new f9a1fdf Merge branch 'develop' into develop
new 97308f8 Merge pull request #1045 from radishlee/develop
new 12ccd50 [RIP-9] Add the system configuration option doc: Direct ByteBuffer memory size
new a83c621 Merge pull request #1044 from Crab2died/develop
new cf2a40b [RIP-9] Modify English document for Design_Trancation.md
new 1b39485 Merge pull request #1072 from JJFighting/develop
new 1858013 Change Configuration_System : We recommend set 655350 - We recommend setting 655350
new c37ccf0 New Change Configuration_System : We recommend set 655350 - We recommend setting 655350
new 5cbd738 Merge pull request #1025 from zjy-may/develop
new 70c88dd Update Design_Remoting.md
new efa7798 Update Design_Remoting.md
new 244fe09 Merge pull request #1011 from dear-Alice-moon/develop
new 8a585ce update Design_loadBlancing.md
new 5456e77 Merge pull request #988 from LvChenhui/develop
new 2fb17d1 [RIP-76] Remove unnecessary dots for Design_Trancation.md
new deb4193 Merge pull request #986 from djangogao/develop
new cb89eaf 更新因为文档:Future.md
new 40779bf Merge pull request #963 from RobertoHuang/develop
new 971fa8e Prepare to release 4.5.0
The 1008 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 | 6 +-
README.md | 2 +
.../apache/rocketmq/broker/BrokerController.java | 183 ++++-
.../broker/dledger/DLedgerRoleChangeHandler.java | 104 +++
.../apache/rocketmq/broker/out/BrokerOuterAPI.java | 2 +-
.../broker/processor/ClientManageProcessor.java | 2 +-
.../rocketmq/broker/slave/SlaveSynchronize.java | 8 +-
.../TransactionalMessageCheckService.java | 21 -
.../client/impl/factory/MQClientInstance.java | 18 +-
.../ConsumeMessageConcurrentlyServiceTest.java | 2 +
.../org/apache/rocketmq/common/ServiceThread.java | 35 +-
.../rocketmq/common/message/MessageDecoder.java | 1 +
.../rocketmq/common/protocol/GroupListTest.java | 52 ++
.../protocol/body/ConsumerRunningInfoTest.java | 108 +++
distribution/bin/dledger/fast-try.sh | 102 +++
.../conf/dledger/broker-n0.conf | 15 +-
.../conf/dledger/broker-n1.conf | 15 +-
.../conf/dledger/broker-n2.conf | 15 +-
distribution/release.xml | 2 +-
docs/cn/RocketMQ_Example.md | 6 +-
docs/cn/concept.md | 4 +-
docs/cn/dledger/deploy_guide.md | 76 +++
docs/cn/dledger/quick_start.md | 61 ++
docs/cn/operation.md | 2 +-
docs/en/CLITools.md | 16 +-
docs/en/Concept.md | 42 +-
docs/en/Configuration_Client.md | 14 +-
docs/en/Configuration_System.md | 10 +-
docs/en/Deployment.md | 8 +-
docs/en/Design_Filter.md | 4 +-
docs/en/Design_LoadBlancing.md | 6 +-
docs/en/Design_Remoting.md | 18 +-
docs/en/Design_Store.md | 4 +-
docs/en/Design_Trancation.md | 16 +-
docs/en/Example_Delay.md | 12 +-
docs/en/Example_Filter.md | 10 +-
docs/en/Example_Orderly.md | 2 +-
docs/en/Example_Transaction.md | 2 +-
docs/en/FAQ.md | 59 +-
docs/en/Feature.md | 36 +-
docs/en/Operations_Consumer.md | 30 +-
docs/en/Operations_Producer.md | 4 +-
docs/en/Operations_Trace.md | 12 +-
docs/en/Troubleshoopting.md | 12 +-
.../namesrv/routeinfo/RouteInfoManager.java | 11 +
pom.xml | 5 +-
store/pom.xml | 15 +
.../rocketmq/store/AllocateMappedFileService.java | 11 +-
.../java/org/apache/rocketmq/store/CommitLog.java | 26 +-
.../org/apache/rocketmq/store/ConsumeQueue.java | 15 +-
.../apache/rocketmq/store/DefaultMessageStore.java | 123 +++-
.../org/apache/rocketmq/store/DispatchRequest.java | 16 +-
.../org/apache/rocketmq/store/MappedFileQueue.java | 4 +-
.../org/apache/rocketmq/store/MessageStore.java | 7 +
.../rocketmq/store/SelectMappedBufferResult.java | 4 +-
.../rocketmq/store/config/MessageStoreConfig.java | 36 +
.../rocketmq/store/dledger/DLedgerCommitLog.java | 747 +++++++++++++++++++++
.../org/apache/rocketmq/store/ha/HAConnection.java | 4 +-
.../store/schedule/ScheduleMessageService.java | 81 ++-
.../apache/rocketmq/store/ConsumeQueueTest.java | 3 +-
.../store/DefaultMessageStoreShutDownTest.java | 2 +-
.../org/apache/rocketmq/store/StoreTestBase.java | 93 +++
.../store/dledger/DLedgerCommitlogTest.java | 213 ++++++
.../store/dledger/MessageStoreTestBase.java | 143 ++++
.../rocketmq/store/dledger/MixCommitlogTest.java | 193 ++++++
store/src/test/resources/logback-test.xml | 2 +-
.../rocketmq/test/factory/ConsumerFactory.java | 10 +
.../rocketmq/test/factory/ProducerFactory.java | 2 +
.../org/apache/rocketmq/test/util/MQAdmin.java | 2 +
.../org/apache/rocketmq/test/base/BaseConf.java | 4 +-
.../rocketmq/test/base/IntegrationTestBase.java | 40 +-
.../base/dledger/DLedgerProduceAndConsumeIT.java | 121 ++++
.../broadcast/order/OrderMsgBroadCastIT.java | 5 +
.../rocketmq/test/delay/NormalMsgDelayIT.java | 3 +-
74 files changed, 2728 insertions(+), 372 deletions(-)
create mode 100644 broker/src/main/java/org/apache/rocketmq/broker/dledger/DLedgerRoleChangeHandler.java
create mode 100644 common/src/test/java/org/apache/rocketmq/common/protocol/GroupListTest.java
create mode 100644 common/src/test/java/org/apache/rocketmq/common/protocol/body/ConsumerRunningInfoTest.java
create mode 100644 distribution/bin/dledger/fast-try.sh
copy acl/src/test/resources/conf/plain_acl_null.yml => distribution/conf/dledger/broker-n0.conf (68%)
copy acl/src/test/resources/conf/plain_acl_null.yml => distribution/conf/dledger/broker-n1.conf (68%)
copy acl/src/test/resources/conf/plain_acl_null.yml => distribution/conf/dledger/broker-n2.conf (68%)
create mode 100644 docs/cn/dledger/deploy_guide.md
create mode 100644 docs/cn/dledger/quick_start.md
create mode 100644 store/src/main/java/org/apache/rocketmq/store/dledger/DLedgerCommitLog.java
create mode 100644 store/src/test/java/org/apache/rocketmq/store/StoreTestBase.java
create mode 100644 store/src/test/java/org/apache/rocketmq/store/dledger/DLedgerCommitlogTest.java
create mode 100644 store/src/test/java/org/apache/rocketmq/store/dledger/MessageStoreTestBase.java
create mode 100644 store/src/test/java/org/apache/rocketmq/store/dledger/MixCommitlogTest.java
create mode 100644 test/src/test/java/org/apache/rocketmq/test/base/dledger/DLedgerProduceAndConsumeIT.java