未验证 提交 f5b79588 编写于 作者: R rongtong 提交者: GitHub

[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
上级 83cc99ad
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<dependency> <dependency>
<groupId>io.openmessaging.storage</groupId> <groupId>io.openmessaging.storage</groupId>
<artifactId>dledger</artifactId> <artifactId>dledger</artifactId>
<version>0.1</version> <version>0.2.0</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.apache.rocketmq</groupId> <groupId>org.apache.rocketmq</groupId>
......
...@@ -148,6 +148,10 @@ public class MessageStoreConfig { ...@@ -148,6 +148,10 @@ public class MessageStoreConfig {
private String dLegerPeers; private String dLegerPeers;
private String dLegerSelfId; private String dLegerSelfId;
private String preferredLeaderId;
private boolean isEnableBatchPush = false;
public boolean isDebugLockEnable() { public boolean isDebugLockEnable() {
return debugLockEnable; return debugLockEnable;
} }
...@@ -702,4 +706,20 @@ public class MessageStoreConfig { ...@@ -702,4 +706,20 @@ public class MessageStoreConfig {
public void setEnableDLegerCommitLog(boolean enableDLegerCommitLog) { public void setEnableDLegerCommitLog(boolean enableDLegerCommitLog) {
this.enableDLegerCommitLog = 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;
}
} }
...@@ -84,6 +84,9 @@ public class DLedgerCommitLog extends CommitLog { ...@@ -84,6 +84,9 @@ public class DLedgerCommitLog extends CommitLog {
dLedgerConfig.setMappedFileSizeForEntryData(defaultMessageStore.getMessageStoreConfig().getMappedFileSizeCommitLog()); dLedgerConfig.setMappedFileSizeForEntryData(defaultMessageStore.getMessageStoreConfig().getMappedFileSizeCommitLog());
dLedgerConfig.setDeleteWhen(defaultMessageStore.getMessageStoreConfig().getDeleteWhen()); dLedgerConfig.setDeleteWhen(defaultMessageStore.getMessageStoreConfig().getDeleteWhen());
dLedgerConfig.setFileReservedHours(defaultMessageStore.getMessageStoreConfig().getFileReservedTime() + 1); dLedgerConfig.setFileReservedHours(defaultMessageStore.getMessageStoreConfig().getFileReservedTime() + 1);
dLedgerConfig.setPreferredLeaderId(defaultMessageStore.getMessageStoreConfig().getPreferredLeaderId());
dLedgerConfig.setEnableBatchPush(defaultMessageStore.getMessageStoreConfig().isEnableBatchPush());
id = Integer.valueOf(dLedgerConfig.getSelfId().substring(1)) + 1; id = Integer.valueOf(dLedgerConfig.getSelfId().substring(1)) + 1;
dLedgerServer = new DLedgerServer(dLedgerConfig); dLedgerServer = new DLedgerServer(dLedgerConfig);
dLedgerFileStore = (DLedgerMmapFileStore) dLedgerServer.getdLedgerStore(); dLedgerFileStore = (DLedgerMmapFileStore) dLedgerServer.getdLedgerStore();
......
...@@ -63,9 +63,9 @@ public class MessageStoreTestBase extends StoreTestBase { ...@@ -63,9 +63,9 @@ public class MessageStoreTestBase extends StoreTestBase {
if (leaderId != null) { if (leaderId != null) {
dLegerServer.getdLedgerConfig().setEnableLeaderElector(false); dLegerServer.getdLedgerConfig().setEnableLeaderElector(false);
if (selfId.equals(leaderId)) { if (selfId.equals(leaderId)) {
dLegerServer.getMemberState().changeToLeader(-1); dLegerServer.getMemberState().changeToLeader(0);
} else { } else {
dLegerServer.getMemberState().changeToFollower(-1, leaderId); dLegerServer.getMemberState().changeToFollower(0, leaderId);
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册