[rocketmq] branch develop updated: [ISSUE #2217] Upgrade dledger version (#2218)

[dinglei]

This is an automated email from the ASF dual-hosted git repository.

dinglei pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git


The following commit(s) were added to refs/heads/develop by this push:
     new f5b7958  [ISSUE #2217] Upgrade dledger version (#2218)
f5b7958 is described below

commit f5b79588d58a1cc2842d364e06a469c0b67cdb39
Author: rongtong <jinrongto...@163.com>
AuthorDate: Fri Jul 31 17:22:22 2020 +0800

    [ISSUE #2217] Upgrade dledger version (#2218)
    
    * feature(dledger):upgrade dledger version and support preferred 
leader/batch push
    
    * feature(dledger):pass the failed UT and pass the CI
---
 store/pom.xml                                        |  2 +-
 .../rocketmq/store/config/MessageStoreConfig.java    | 20 ++++++++++++++++++++
 .../rocketmq/store/dledger/DLedgerCommitLog.java     |  3 +++
 .../rocketmq/store/dledger/MessageStoreTestBase.java |  4 ++--
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/store/pom.xml b/store/pom.xml
index d7d0b9f..8f4b44a 100644
--- a/store/pom.xml
+++ b/store/pom.xml
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>io.openmessaging.storage</groupId>
             <artifactId>dledger</artifactId>
-            <version>0.1</version>
+            <version>0.2.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.rocketmq</groupId>
diff --git 
a/store/src/main/java/org/apache/rocketmq/store/config/MessageStoreConfig.java 
b/store/src/main/java/org/apache/rocketmq/store/config/MessageStoreConfig.java
index 7891f71..c13ad4c 100644
--- 
a/store/src/main/java/org/apache/rocketmq/store/config/MessageStoreConfig.java
+++ 
b/store/src/main/java/org/apache/rocketmq/store/config/MessageStoreConfig.java
@@ -148,6 +148,10 @@ public class MessageStoreConfig {
     private String dLegerPeers;
     private String dLegerSelfId;
 
+    private String preferredLeaderId;
+
+    private boolean isEnableBatchPush = false;
+
     public boolean isDebugLockEnable() {
         return debugLockEnable;
     }
@@ -702,4 +706,20 @@ public class MessageStoreConfig {
     public void setEnableDLegerCommitLog(boolean enableDLegerCommitLog) {
         this.enableDLegerCommitLog = enableDLegerCommitLog;
     }
+
+    public String getPreferredLeaderId() {
+        return preferredLeaderId;
+    }
+
+    public void setPreferredLeaderId(String preferredLeaderId) {
+        this.preferredLeaderId = preferredLeaderId;
+    }
+
+    public boolean isEnableBatchPush() {
+        return isEnableBatchPush;
+    }
+
+    public void setEnableBatchPush(boolean enableBatchPush) {
+        isEnableBatchPush = enableBatchPush;
+    }
 }
diff --git 
a/store/src/main/java/org/apache/rocketmq/store/dledger/DLedgerCommitLog.java 
b/store/src/main/java/org/apache/rocketmq/store/dledger/DLedgerCommitLog.java
index 3361b63..400ad78 100644
--- 
a/store/src/main/java/org/apache/rocketmq/store/dledger/DLedgerCommitLog.java
+++ 
b/store/src/main/java/org/apache/rocketmq/store/dledger/DLedgerCommitLog.java
@@ -84,6 +84,9 @@ public class DLedgerCommitLog extends CommitLog {
         
dLedgerConfig.setMappedFileSizeForEntryData(defaultMessageStore.getMessageStoreConfig().getMappedFileSizeCommitLog());
         
dLedgerConfig.setDeleteWhen(defaultMessageStore.getMessageStoreConfig().getDeleteWhen());
         
dLedgerConfig.setFileReservedHours(defaultMessageStore.getMessageStoreConfig().getFileReservedTime()
 + 1);
+        
dLedgerConfig.setPreferredLeaderId(defaultMessageStore.getMessageStoreConfig().getPreferredLeaderId());
+        
dLedgerConfig.setEnableBatchPush(defaultMessageStore.getMessageStoreConfig().isEnableBatchPush());
+
         id = Integer.valueOf(dLedgerConfig.getSelfId().substring(1)) + 1;
         dLedgerServer = new DLedgerServer(dLedgerConfig);
         dLedgerFileStore = (DLedgerMmapFileStore) 
dLedgerServer.getdLedgerStore();
diff --git 
a/store/src/test/java/org/apache/rocketmq/store/dledger/MessageStoreTestBase.java
 
b/store/src/test/java/org/apache/rocketmq/store/dledger/MessageStoreTestBase.java
index 5b0ca34..5864b28 100644
--- 
a/store/src/test/java/org/apache/rocketmq/store/dledger/MessageStoreTestBase.java
+++ 
b/store/src/test/java/org/apache/rocketmq/store/dledger/MessageStoreTestBase.java
@@ -63,9 +63,9 @@ public class MessageStoreTestBase extends StoreTestBase {
         if (leaderId != null) {
             dLegerServer.getdLedgerConfig().setEnableLeaderElector(false);
             if (selfId.equals(leaderId)) {
-                dLegerServer.getMemberState().changeToLeader(-1);
+                dLegerServer.getMemberState().changeToLeader(0);
             } else {
-                dLegerServer.getMemberState().changeToFollower(-1, leaderId);
+                dLegerServer.getMemberState().changeToFollower(0, leaderId);
             }
 
         }