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/03/07 08:46:37 UTC
[rocketmq] branch develop updated (bf4ac79 -> e90d20d)
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 bf4ac79 Merge pull request #1028 from pengbin7/develop
add 515bc35 Add dleger commitlog with tests
add 5f73002 Add role change handler for broker controller
add 456691b Add IT tests for dleger commitlog
add 1a2fe9f Test the committed pos for dleger
add dbc5987 Fix tests
add 29fb333 fix
add cc3f9f3 Fix check style
add b3ba266 Fix os pache cache busy problem
add d2cafcf Fix locktime and group
add aed6f0e Fix tests for dleger commitlog, add group check
add 5020f32 Add id for dleger commitlog
add cbbd6ff Polish role change logic
add 4137364 Remove non-existed brokerId of the same broker addr
add 84bd640 Reduce slave sync interval
add 5a19e6e Fix reput problem
add 0c69aca Get reput offset from logic queues
add 9342674 Polish maxPhysicOffset for logic queue
add ffc733a Polish log for reput offset
add 866e309 Make role change handler asynchronous
add b9ed0ab Fix tests
add 7b42909 Review code and fix
add f2bcae0 fix
add 3e9799b Use io.openmessaging instead
add d30d0e8 Polish DLedgerCommitlog, and rename dleger to dledger
add f8634b4 Divide old commitlog and dledger commitlog
add 77b252b Polish checkstyle
add b31c17f Load and recover for dledger commitlog
add 58496c2 Rename dleger to dledger
add 8f788c3 Add reputoffset test for dledger commitlog test
add ed31e74 Add tests for mixed commitlog test
add 927385b Enhance tests for mixed commitlog
add 44f696c Add deleting test for mixed commitlog
add 30028a1 Make ServiceThread be able to be restarted
add 9c8fa5e Catch service thread exception of scheduledMessage and transactionalMessage when changing role
add 235ac79 Polish checkstyle
add 415b38b Do not return flush_slave_timeout to client
add f8dd3f7 Fix import names
add 1276539 Add test for trucating consumequeue if the dledger commitlog is deleted
add 698ef2f Fix old ha service
add 38554a0 Polish ServiceThread to make inner thread private
add 43753d6 Polish makeStop for ServiceThread
add 1e358ae Annotate
add a50b733 Add tests for consume queue fall behind
add a90342e No need to change to slave
add 5ce20e8 Make sure the fallen behind node not to be leader
add 5bf113a Polish tests, separate ports, disable log, etc.
add 1c2cbfa Refresh the message store config to dledger config
add 55eda18 Fix style
add e149495 Fix the initial reput offset, according to the maxPhisicalPosInLogicQueue
add 3f0b0b2 Revise the reputoffset if it is smaller that minOffset of the commitlog
add 28a0906 Polish file reserved hours to 24 * 365 * 10 when disableDeleteDLedger
add 7e8c012 Fix typo
add 89c0668 Add example conf and bin for dledger
add 0d39569 Add docs
add d097acb Add cn deploy guide for rocketmq cluster
add 8cec194 Polish new line for docs
add 7574fde Update README.md
add 0586d57 Merge branch 'develop' into store_with_dledger
add cd4779e Do not send heartbeat for every pull request
add f3130c3 Polish pom to use dledger 0.1 from central repo
add 1bc1f22 Add copywright for some files
new e90d20d Merge pull request #1046 from apache/store_with_dledger
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 | 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 +-
.../org/apache/rocketmq/common/ServiceThread.java | 35 +-
.../rocketmq/common/message/MessageDecoder.java | 1 +
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/dledger/deploy_guide.md | 76 +++
docs/cn/dledger/quick_start.md | 61 ++
.../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 +-
48 files changed, 2399 insertions(+), 210 deletions(-)
create mode 100644 broker/src/main/java/org/apache/rocketmq/broker/dledger/DLedgerRoleChangeHandler.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
[rocketmq] 01/01: Merge pull request #1046 from
apache/store_with_dledger
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 e90d20dd49338b8934b385413b5c74a509bb26b3
Merge: bf4ac79 1bc1f22
Author: Zhendong Liu <zh...@yeah.net>
AuthorDate: Thu Mar 7 16:46:26 2019 +0800
Merge pull request #1046 from apache/store_with_dledger
Add store with dledger
.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 +-
.../org/apache/rocketmq/common/ServiceThread.java | 35 +-
.../rocketmq/common/message/MessageDecoder.java | 1 +
distribution/bin/dledger/fast-try.sh | 102 +++
distribution/conf/dledger/broker-n0.conf | 27 +
distribution/conf/dledger/broker-n1.conf | 27 +
distribution/conf/dledger/broker-n2.conf | 27 +
distribution/release.xml | 2 +-
docs/cn/dledger/deploy_guide.md | 76 +++
docs/cn/dledger/quick_start.md | 61 ++
.../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 +-
48 files changed, 2444 insertions(+), 201 deletions(-)