Merge pull request #222 from RongtongJin/after_proxy_module

[ISSUE #221]Polish the code after separating DLedgerProxy module

README.md

@@ -16,13 +16,13 @@ Dledger has added many new features that are not described in the [original pape
 * Parallel log replication between leader and followers
 * Asynchronous replication
 * State machine
+* Multi-Raft
 * High tolerance of symmetric network partition
 * High tolerance of asymmetric network partition
 * [Jepsen verification with fault injection](https:/openmessaging/openmessaging-dledger-jepsen)
 
 ### New features waiting to be added ###
 * Snapshot
-* Multi-Raft 
 * Dynamic membership & configuration change
 * SSL/TLS support
 

command/src/main/java/io/openmessaging/storage/dledger/cmdline/AppendCommand.java → command/src/main/java/io/openmessaging/storage/dledger/command/AppendCommand.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger.cmdline;
+package io.openmessaging.storage.dledger.command;
 
 import com.alibaba.fastjson.JSON;
 import com.beust.jcommander.Parameter;

command/src/main/java/io/openmessaging/storage/dledger/cmdline/BaseCommand.java → command/src/main/java/io/openmessaging/storage/dledger/command/BaseCommand.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger.cmdline;
+package io.openmessaging.storage.dledger.command;
 
 public abstract class BaseCommand {
 

command/src/main/java/io/openmessaging/storage/dledger/cmdline/BossCommand.java → command/src/main/java/io/openmessaging/storage/dledger/command/BossCommand.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger.cmdline;
+package io.openmessaging.storage.dledger.command;
 
 import com.beust.jcommander.JCommander;
 

command/src/main/java/io/openmessaging/storage/dledger/cmdline/ConfigCommand.java → command/src/main/java/io/openmessaging/storage/dledger/command/ConfigCommand.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger.cmdline;
+package io.openmessaging.storage.dledger.command;
 
 import com.beust.jcommander.Parameter;
 import org.slf4j.Logger;

command/src/main/java/io/openmessaging/storage/dledger/DLedger.java → command/src/main/java/io/openmessaging/storage/dledger/command/DLedger.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger;
+package io.openmessaging.storage.dledger.command;
 
 import com.alibaba.fastjson.JSON;
 import com.beust.jcommander.JCommander;
-import io.openmessaging.storage.dledger.cmdline.ConfigCommand;
+import io.openmessaging.storage.dledger.DLedgerConfig;
 import io.openmessaging.storage.dledger.proxy.DLedgerProxy;
 import io.openmessaging.storage.dledger.proxy.DLedgerProxyConfig;
 import io.openmessaging.storage.dledger.proxy.util.ConfigUtils;

command/src/main/java/io/openmessaging/storage/dledger/cmdline/GetCommand.java → command/src/main/java/io/openmessaging/storage/dledger/command/GetCommand.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger.cmdline;
+package io.openmessaging.storage.dledger.command;
 
 import com.alibaba.fastjson.JSON;
 import com.beust.jcommander.Parameter;

command/src/main/java/io/openmessaging/storage/dledger/cmdline/LeadershipTransferCommand.java → command/src/main/java/io/openmessaging/storage/dledger/command/LeadershipTransferCommand.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger.cmdline;
+package io.openmessaging.storage.dledger.command;
 
 import com.alibaba.fastjson.JSON;
 import com.beust.jcommander.Parameter;

command/src/main/java/io/openmessaging/storage/dledger/cmdline/ReadFileCommand.java → command/src/main/java/io/openmessaging/storage/dledger/command/ReadFileCommand.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger.cmdline;
+package io.openmessaging.storage.dledger.command;
 
 import com.alibaba.fastjson.JSON;
 import com.beust.jcommander.Parameter;

command/src/main/java/io/openmessaging/storage/dledger/cmdline/ServerCommand.java → command/src/main/java/io/openmessaging/storage/dledger/command/ServerCommand.java

@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger.cmdline;
+package io.openmessaging.storage.dledger.command;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
-import io.openmessaging.storage.dledger.DLedger;
 import io.openmessaging.storage.dledger.DLedgerConfig;
 import io.openmessaging.storage.dledger.proxy.DLedgerProxyConfig;
 import io.openmessaging.storage.dledger.proxy.util.ConfigUtils;

command/src/test/java/io/openmessaging/storage/dledger/dledger/DLedgerProxyConfigTest.java → command/src/test/java/io/openmessaging/storage/dledger/command/DLedgerProxyConfigTest.java

@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger.dledger;
+package io.openmessaging.storage.dledger.command;
 
 import com.beust.jcommander.JCommander;
-import io.openmessaging.storage.dledger.cmdline.ConfigCommand;
 import io.openmessaging.storage.dledger.proxy.DLedgerProxyConfig;
 import io.openmessaging.storage.dledger.proxy.util.ConfigUtils;
 import org.junit.jupiter.api.Assertions;

dledger/src/main/java/io/openmessaging/storage/dledger/DLedgerEntryPusher.java

@@ -87,25 +87,6 @@ public DLedgerEntryPusher(DLedgerConfig dLedgerConfig, MemberState memberState,
  this.fsmCaller = Optional.empty();
  }
 
- public DLedgerEntryPusher(DLedgerConfig dLedgerConfig, MemberState memberState, DLedgerStore dLedgerStore) {
- this.dLedgerConfig = dLedgerConfig;
- this.memberState = memberState;
- this.dLedgerStore = dLedgerStore;
- for (String peer : memberState.getPeerMap().keySet()) {
- if (!peer.equals(memberState.getSelfId())) {
- dispatcherMap.put(peer, new EntryDispatcher(peer, logger));
- }
- }
- this.entryHandler = new EntryHandler(logger);
- this.quorumAckChecker = new QuorumAckChecker(logger);
- this.fsmCaller = Optional.empty();
- }
-
- public void registerDLedgerRpcService(DLedgerRpcService dLedgerRpcService) {
- this.dLedgerRpcService = dLedgerRpcService;
- }
-
-
  public void startup() {
  entryHandler.start();
  quorumAckChecker.start();

dledger/src/main/java/io/openmessaging/storage/dledger/DLedgerLeaderElector.java

@@ -80,16 +80,6 @@ public DLedgerLeaderElector(DLedgerConfig dLedgerConfig, MemberState memberState
  refreshIntervals(dLedgerConfig);
  }
 
- public DLedgerLeaderElector(DLedgerConfig dLedgerConfig, MemberState memberState) {
- this.dLedgerConfig = dLedgerConfig;
- this.memberState = memberState;
- refreshIntervals(dLedgerConfig);
- }
-
- public void registerDLedgerRpcService(DLedgerRpcService dLedgerRpcService) {
- this.dLedgerRpcService = dLedgerRpcService;
- }
-
  public void startup() {
  stateMaintainer.start();
  for (RoleChangeHandler roleChangeHandler : roleChangeHandlers) {

dledger/src/main/java/io/openmessaging/storage/dledger/DLedgerServer.java

@@ -130,12 +130,6 @@ public DLedgerServer(DLedgerConfig dLedgerConfig, DLedgerRpcService dLedgerRpcSe
  this.fsmCaller = Optional.empty();
  }
 
- public void registerDLedgerRpcService(DLedgerRpcService dLedgerRpcService) {
- this.dLedgerRpcService = dLedgerRpcService;
- this.dLedgerLeaderElector.registerDLedgerRpcService(dLedgerRpcService);
- this.dLedgerEntryPusher.registerDLedgerRpcService(dLedgerRpcService);
- }
-
  /**
  * Start up, if the DLedgerRpcService is exclusive for this DLedgerServer, we should also start up it.
  */

dledger/src/test/java/io/openmessaging/storage/dledger/store/file/DefaultMmapFileTest.java

@@ -17,7 +17,6 @@
 package io.openmessaging.storage.dledger.store.file;
 
 import io.openmessaging.storage.dledger.ServerTestBase;
-import jdk.nashorn.internal.ir.annotations.Ignore;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 

proxy/pom.xml

@@ -24,6 +24,7 @@
  <dependency>
  <groupId>org.slf4j</groupId>
  <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
  </dependency>
 
  <dependency>

proxy/src/test/java/io/openmessaging/storage/dledger/AppendAndGetTest.java → proxy/src/test/java/io/openmessaging/storage/dledger/proxy/AppendAndGetTest.java

@@ -14,15 +14,16 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger;
+package io.openmessaging.storage.dledger.proxy;
 
+import io.openmessaging.storage.dledger.DLedgerConfig;
+import io.openmessaging.storage.dledger.DLedgerServer;
 import io.openmessaging.storage.dledger.client.DLedgerClient;
 import io.openmessaging.storage.dledger.entry.DLedgerEntry;
 import io.openmessaging.storage.dledger.protocol.AppendEntryRequest;
 import io.openmessaging.storage.dledger.protocol.AppendEntryResponse;
 import io.openmessaging.storage.dledger.protocol.DLedgerResponseCode;
 import io.openmessaging.storage.dledger.protocol.GetEntriesResponse;
-import io.openmessaging.storage.dledger.proxy.DLedgerProxy;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;

proxy/src/test/java/io/openmessaging/storage/dledger/AppendAndPushTest.java → proxy/src/test/java/io/openmessaging/storage/dledger/proxy/AppendAndPushTest.java

@@ -14,14 +14,18 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger;
+package io.openmessaging.storage.dledger.proxy;
 
+import io.openmessaging.storage.dledger.AppendFuture;
+import io.openmessaging.storage.dledger.BatchAppendFuture;
+import io.openmessaging.storage.dledger.DLedgerConfig;
+import io.openmessaging.storage.dledger.DLedgerRpcNettyService;
+import io.openmessaging.storage.dledger.DLedgerServer;
 import io.openmessaging.storage.dledger.entry.DLedgerEntry;
 import io.openmessaging.storage.dledger.protocol.AppendEntryRequest;
 import io.openmessaging.storage.dledger.protocol.AppendEntryResponse;
 import io.openmessaging.storage.dledger.protocol.BatchAppendEntryRequest;
 import io.openmessaging.storage.dledger.protocol.DLedgerResponseCode;
-import io.openmessaging.storage.dledger.proxy.DLedgerProxy;
 import io.openmessaging.storage.dledger.utils.DLedgerUtils;
 import java.util.ArrayList;
 import java.util.LinkedList;

proxy/src/test/java/io/openmessaging/storage/dledger/BatchPushTest.java → proxy/src/test/java/io/openmessaging/storage/dledger/proxy/BatchPushTest.java

@@ -14,15 +14,18 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger;
+package io.openmessaging.storage.dledger.proxy;
 
+import io.openmessaging.storage.dledger.AppendFuture;
+import io.openmessaging.storage.dledger.DLedgerConfig;
+import io.openmessaging.storage.dledger.DLedgerRpcNettyService;
+import io.openmessaging.storage.dledger.DLedgerServer;
 import io.openmessaging.storage.dledger.client.DLedgerClient;
 import io.openmessaging.storage.dledger.entry.DLedgerEntry;
 import io.openmessaging.storage.dledger.protocol.AppendEntryRequest;
 import io.openmessaging.storage.dledger.protocol.AppendEntryResponse;
 import io.openmessaging.storage.dledger.protocol.DLedgerResponseCode;
 import io.openmessaging.storage.dledger.protocol.GetEntriesResponse;
-import io.openmessaging.storage.dledger.proxy.DLedgerProxy;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;

proxy/src/test/java/io/openmessaging/storage/dledger/LeaderElectorTest.java → proxy/src/test/java/io/openmessaging/storage/dledger/proxy/LeaderElectorTest.java

@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger;
+package io.openmessaging.storage.dledger.proxy;
 
+import io.openmessaging.storage.dledger.DLedgerConfig;
+import io.openmessaging.storage.dledger.DLedgerServer;
+import io.openmessaging.storage.dledger.MemberState;
 import io.openmessaging.storage.dledger.protocol.AppendEntryRequest;
 import io.openmessaging.storage.dledger.protocol.AppendEntryResponse;
 import io.openmessaging.storage.dledger.protocol.DLedgerResponseCode;
-import io.openmessaging.storage.dledger.proxy.DLedgerProxy;
-import io.openmessaging.storage.dledger.proxy.DLedgerProxyConfig;
 import io.openmessaging.storage.dledger.utils.DLedgerUtils;
 import java.util.ArrayList;
 import java.util.Arrays;

proxy/src/test/java/io/openmessaging/storage/dledger/ProxyAppendAndGetTest.java → proxy/src/test/java/io/openmessaging/storage/dledger/proxy/ProxyAppendAndGetTest.java

@@ -14,19 +14,16 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger;
+package io.openmessaging.storage.dledger.proxy;
 
 import io.openmessaging.storage.dledger.DLedgerConfig;
 import io.openmessaging.storage.dledger.DLedgerServer;
-import io.openmessaging.storage.dledger.ServerTestHarness;
 import io.openmessaging.storage.dledger.client.DLedgerClient;
 import io.openmessaging.storage.dledger.entry.DLedgerEntry;
 import io.openmessaging.storage.dledger.protocol.AppendEntryRequest;
 import io.openmessaging.storage.dledger.protocol.AppendEntryResponse;
 import io.openmessaging.storage.dledger.protocol.DLedgerResponseCode;
 import io.openmessaging.storage.dledger.protocol.GetEntriesResponse;
-import io.openmessaging.storage.dledger.proxy.DLedgerProxy;
-import io.openmessaging.storage.dledger.proxy.DLedgerProxyConfig;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 

proxy/src/test/java/io/openmessaging/storage/dledger/ServerTestBase.java → proxy/src/test/java/io/openmessaging/storage/dledger/proxy/ServerTestBase.java

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger;
-import io.openmessaging.storage.dledger.util.FileTestUtil;
+package io.openmessaging.storage.dledger.proxy;
+import io.openmessaging.storage.dledger.proxy.util.FileTestUtil;
 
 import java.util.ArrayList;
 import java.util.List;

proxy/src/test/java/io/openmessaging/storage/dledger/ServerTestHarness.java → proxy/src/test/java/io/openmessaging/storage/dledger/proxy/ServerTestHarness.java

@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger;
+package io.openmessaging.storage.dledger.proxy;
 
+import io.openmessaging.storage.dledger.DLedgerConfig;
+import io.openmessaging.storage.dledger.DLedgerServer;
+import io.openmessaging.storage.dledger.MemberState;
 import io.openmessaging.storage.dledger.client.DLedgerClient;
-import io.openmessaging.storage.dledger.proxy.DLedgerProxy;
-import io.openmessaging.storage.dledger.proxy.DLedgerProxyConfig;
-import io.openmessaging.storage.dledger.util.FileTestUtil;
+import io.openmessaging.storage.dledger.proxy.util.FileTestUtil;
 import java.io.File;
 import java.util.Arrays;
 import java.util.List;

proxy/src/test/java/io/openmessaging/storage/dledger/util/ConfigUtilsTest.java → proxy/src/test/java/io/openmessaging/storage/dledger/proxy/util/ConfigUtilsTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger.util;
+package io.openmessaging.storage.dledger.proxy.util;
 
 import io.openmessaging.storage.dledger.proxy.DLedgerProxyConfig;
 import io.openmessaging.storage.dledger.proxy.util.ConfigUtils;

proxy/src/test/java/io/openmessaging/storage/dledger/util/FileTestUtil.java → proxy/src/test/java/io/openmessaging/storage/dledger/proxy/util/FileTestUtil.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger.util;
+package io.openmessaging.storage.dledger.proxy.util;
 
 import io.openmessaging.storage.dledger.utils.IOUtils;
 import java.io.File;