release 0.0.6 (#95)

shihuili1218 · web-flow · commit 6333a4b67647 · 2024-05-11T16:33:24.000+08:00
release 0.0.6
diff --git a/klein-common/pom.xml b/klein-common/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <artifactId>klein</artifactId>
         <groupId>com.ofcoder.klein</groupId>
-        <version>0.0.5</version>
+        <version>0.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.ofcoder.klein.common</groupId>
     <artifactId>klein-common</artifactId>
-    <version>0.0.5</version>
+    <version>0.0.6</version>
     <packaging>jar</packaging>
 
     <properties>
diff --git a/klein-consensus/klein-consensus-facade/pom.xml b/klein-consensus/klein-consensus-facade/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <artifactId>klein-consensus</artifactId>
         <groupId>com.ofcoder.klein.consensus</groupId>
-        <version>0.0.5</version>
+        <version>0.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.ofcoder.klein.consensus.facade</groupId>
     <artifactId>klein-consensus-facade</artifactId>
-    <version>0.0.5</version>
+    <version>0.0.6</version>
     <packaging>jar</packaging>
 
     <properties>
diff --git a/klein-consensus/klein-consensus-paxos/pom.xml b/klein-consensus/klein-consensus-paxos/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <artifactId>klein-consensus</artifactId>
         <groupId>com.ofcoder.klein.consensus</groupId>
-        <version>0.0.5</version>
+        <version>0.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.ofcoder.klein.consensus.paxos</groupId>
     <artifactId>klein-consensus-paxos</artifactId>
-    <version>0.0.5</version>
+    <version>0.0.6</version>
     <packaging>jar</packaging>
 
     <properties>
diff --git a/klein-consensus/klein-consensus-paxos/src/main/java/com/ofcoder/klein/consensus/paxos/core/AcceptorImpl.java b/klein-consensus/klein-consensus-paxos/src/main/java/com/ofcoder/klein/consensus/paxos/core/AcceptorImpl.java
@@ -68,7 +68,7 @@ public void shutdown() {
 
     @Override
     public AcceptRes handleAcceptRequest(final AcceptReq req, final boolean isSelf) {
-        LOG.info("processing the accept message from node-{}, instanceId: {}, proposalNO: {}, checksum: {}", req.getNodeId(), req.getInstanceId(), req.getProposalNo(), req.getChecksum());
+        LOG.info("processing the accept request from node-{}, instanceId: {}, proposalNO: {}, checksum: {}", req.getNodeId(), req.getInstanceId(), req.getProposalNo(), req.getChecksum());
 
         final long selfProposalNo = self.getCurProposalNo();
         final long selfInstanceId = self.getCurInstanceId();
@@ -161,7 +161,7 @@ public AcceptRes handleAcceptRequest(final AcceptReq req, final boolean isSelf)
 
     @Override
     public PrepareRes handlePrepareRequest(final PrepareReq req, final boolean isSelf) {
-        LOG.info("processing the prepare message from node-{}, isSelf: {}", req.getNodeId(), isSelf);
+        LOG.info("processing the prepare request from node-{}, {}, isSelf: {}", req.getNodeId(), req.getProposalNo(), isSelf);
         synchronized (negLock) {
             final long curProposalNo = self.getCurProposalNo();
             final long curInstanceId = self.getCurInstanceId();
diff --git a/klein-consensus/klein-consensus-paxos/src/main/java/com/ofcoder/klein/consensus/paxos/core/LearnerImpl.java b/klein-consensus/klein-consensus-paxos/src/main/java/com/ofcoder/klein/consensus/paxos/core/LearnerImpl.java
@@ -303,7 +303,7 @@ public void alignData(final NodeState state) {
     }
 
     private boolean handleConfirmRequest(final ConfirmReq req) {
-        LOG.info("processing the confirm message from node-{}, instance: {}", req.getNodeId(), req.getInstanceId());
+        LOG.info("processing the confirm request from node-{}, instance: {}", req.getNodeId(), req.getInstanceId());
 
         if (req.getInstanceId() <= getLastCheckpoint()) {
             // the instance is compressed.
@@ -396,7 +396,7 @@ public void applyDone(final Map<Command, Object> result) {
                     } else {
                         final Endpoint master = memberConfig.getMaster();
                         if (master != null) {
-                            this.dataAligner.diff(instanceId, master, new ApplyAfterLearnCallback(i));
+                            this.dataAligner.diff(i, master, new ApplyAfterLearnCallback(i));
                         }
                     }
                 }
diff --git a/klein-consensus/klein-consensus-paxos/src/main/java/com/ofcoder/klein/consensus/paxos/core/ProposerImpl.java b/klein-consensus/klein-consensus-paxos/src/main/java/com/ofcoder/klein/consensus/paxos/core/ProposerImpl.java
@@ -84,6 +84,7 @@ public class ProposerImpl implements Proposer {
     private long prepareTimeout;
     private long acceptTimeout;
     private RingBuffer<ProposalWithDone> proposeQueue;
+    private Disruptor<ProposalWithDone> proposeDisruptor;
     private CountDownLatch shutdownLatch;
     /**
      * The instance of the Prepare phase has been executed.
@@ -106,7 +107,7 @@ public void init(final ConsensusProp op) {
         this.logManager = ExtensionLoader.getExtensionLoader(LogManager.class).getJoin();
 
         // Disruptor to run propose.
-        Disruptor<ProposalWithDone> proposeDisruptor = DisruptorBuilder.<ProposalWithDone>newInstance()
+        proposeDisruptor = DisruptorBuilder.<ProposalWithDone>newInstance()
                 .setRingBufferSize(RUNNING_BUFFER_SIZE)
                 .setEventFactory(ProposalWithDone::new)
                 .setThreadFactory(KleinThreadFactory.create("paxos-propose-disruptor-", true))
@@ -130,6 +131,8 @@ public void shutdown() {
                 throw new ShutdownException(e.getMessage(), e);
             }
         }
+
+        proposeDisruptor.shutdown();
     }
 
     /**
@@ -251,8 +254,8 @@ public void complete(final AcceptRes result) {
 
     private void handleAcceptResponse(final ProposeContext ctxt, final PhaseCallback.AcceptPhaseCallback callback,
                                       final AcceptRes result, final Endpoint it) {
-        LOG.info("handling node-{}'s accept response, local.proposalNo: {}, instanceId: {}, remote.instanceState: {}, result: {}",
-                result.getNodeId(), ctxt.getGrantedProposalNo(), ctxt.getInstanceId(), result.getInstanceState(), result.getResult());
+        LOG.info("handling node-{}'s accept response, local.proposalNo: {}, instanceId: {}, remote.proposalNo: {}, result: {}",
+                result.getNodeId(), ctxt.getGrantedProposalNo(), ctxt.getInstanceId(), result.getCurProposalNo(), result.getResult());
         self.updateCurProposalNo(result.getCurProposalNo());
         self.updateCurInstanceId(result.getCurInstanceId());
 
diff --git a/klein-consensus/pom.xml b/klein-consensus/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>klein</artifactId>
         <groupId>com.ofcoder.klein</groupId>
-        <version>0.0.5</version>
+        <version>0.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.ofcoder.klein.consensus</groupId>
     <artifactId>klein-consensus</artifactId>
     <packaging>pom</packaging>
-    <version>0.0.5</version>
+    <version>0.0.6</version>
 
     <modules>
         <module>klein-consensus-paxos</module>
diff --git a/klein-core/pom.xml b/klein-core/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <artifactId>klein</artifactId>
         <groupId>com.ofcoder.klein</groupId>
-        <version>0.0.5</version>
+        <version>0.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.ofcoder.klein.core</groupId>
     <artifactId>klein-core</artifactId>
-    <version>0.0.5</version>
+    <version>0.0.6</version>
     <packaging>jar</packaging>
 
     <properties>
diff --git a/klein-example/pom.xml b/klein-example/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <artifactId>klein</artifactId>
         <groupId>com.ofcoder.klein</groupId>
-        <version>0.0.5</version>
+        <version>0.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.ofcoder.klein.example</groupId>
     <artifactId>klein-example</artifactId>
-    <version>0.0.5</version>
+    <version>0.0.6</version>
     <packaging>jar</packaging>
 
     <properties>
diff --git a/klein-jepsen/klein-jepsen-server/pom.xml b/klein-jepsen/klein-jepsen-server/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <artifactId>klein-jepsen</artifactId>
         <groupId>com.ofcoder.klein.jepsen</groupId>
-        <version>0.0.5</version>
+        <version>0.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.ofcoder.klein.jepsen.server</groupId>
     <artifactId>klein-jepsen-server</artifactId>
-    <version>0.0.5</version>
+    <version>0.0.6</version>
     <packaging>jar</packaging>
 
     <properties>
diff --git a/klein-jepsen/pom.xml b/klein-jepsen/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <artifactId>klein</artifactId>
         <groupId>com.ofcoder.klein</groupId>
-        <version>0.0.5</version>
+        <version>0.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.ofcoder.klein.jepsen</groupId>
     <artifactId>klein-jepsen</artifactId>
-    <version>0.0.5</version>
+    <version>0.0.6</version>
     <packaging>pom</packaging>
     <modules>
         <module>klein-jepsen-server</module>
diff --git a/klein-rpc/klein-rpc-facade/pom.xml b/klein-rpc/klein-rpc-facade/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <artifactId>klein-rpc</artifactId>
         <groupId>com.ofcoder.klein.rpc</groupId>
-        <version>0.0.5</version>
+        <version>0.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.ofcoder.klein.rpc.facade</groupId>
     <artifactId>klein-rpc-facade</artifactId>
-    <version>0.0.5</version>
+    <version>0.0.6</version>
     <packaging>jar</packaging>
 
     <properties>
diff --git a/klein-rpc/klein-rpc-grpc/pom.xml b/klein-rpc/klein-rpc-grpc/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <artifactId>klein-rpc</artifactId>
         <groupId>com.ofcoder.klein.rpc</groupId>
-        <version>0.0.5</version>
+        <version>0.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.ofcoder.klein.rpc.grpc</groupId>
     <artifactId>klein-rpc-grpc</artifactId>
-    <version>0.0.5</version>
+    <version>0.0.6</version>
     <packaging>jar</packaging>
 
     <properties>
diff --git a/klein-rpc/pom.xml b/klein-rpc/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>klein</artifactId>
         <groupId>com.ofcoder.klein</groupId>
-        <version>0.0.5</version>
+        <version>0.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.ofcoder.klein.rpc</groupId>
     <artifactId>klein-rpc</artifactId>
     <packaging>pom</packaging>
-    <version>0.0.5</version>
+    <version>0.0.6</version>
 
     <modules>
         <module>klein-rpc-grpc</module>
diff --git a/klein-spi/pom.xml b/klein-spi/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <artifactId>klein</artifactId>
         <groupId>com.ofcoder.klein</groupId>
-        <version>0.0.5</version>
+        <version>0.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.ofcoder.klein.spi</groupId>
     <artifactId>klein-spi</artifactId>
-    <version>0.0.5</version>
+    <version>0.0.6</version>
     <packaging>jar</packaging>
 
     <properties>
diff --git a/klein-storage/klein-storage-facade/pom.xml b/klein-storage/klein-storage-facade/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <artifactId>klein-storage</artifactId>
         <groupId>com.ofcoder.klein.storage</groupId>
-        <version>0.0.5</version>
+        <version>0.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.ofcoder.klein.storage.api</groupId>
     <artifactId>klein-storage-facade</artifactId>
-    <version>0.0.5</version>
+    <version>0.0.6</version>
     <packaging>jar</packaging>
 
     <properties>
diff --git a/klein-storage/klein-storage-facade/src/main/java/com/ofcoder/klein/storage/facade/TraceManager.java b/klein-storage/klein-storage-facade/src/main/java/com/ofcoder/klein/storage/facade/TraceManager.java
@@ -22,6 +22,12 @@
 
 @SPI
 public interface TraceManager {
+    /**
+     * save trace record.
+     *
+     * @param name     file name
+     * @param contents trace entry
+     */
     void save(String name, List<String> contents);
 
     /**
diff --git a/klein-storage/klein-storage-facade/src/main/java/com/ofcoder/klein/storage/facade/config/StorageProp.java b/klein-storage/klein-storage-facade/src/main/java/com/ofcoder/klein/storage/facade/config/StorageProp.java
@@ -16,6 +16,8 @@
  */
 package com.ofcoder.klein.storage.facade.config;
 
+import java.io.File;
+
 import com.ofcoder.klein.common.util.SystemPropertyUtil;
 
 /**
@@ -25,6 +27,7 @@
  */
 public class StorageProp {
     private String id = SystemPropertyUtil.get("klein.id", "1");
+    private String dataPath = SystemPropertyUtil.get("klein.storage.data-path", SystemPropertyUtil.get("user.dir", "") + File.separator + "data") + File.separator + id;
     private int traceBlockSize = SystemPropertyUtil.getInt("klein.storage.trace-block", 1024);
 
     /**
@@ -45,6 +48,14 @@ public void setId(final String id) {
         this.id = id;
     }
 
+    public String getDataPath() {
+        return dataPath;
+    }
+
+    public void setDataPath(final String dataPath) {
+        this.dataPath = dataPath;
+    }
+
     public int getTraceBlockSize() {
         return traceBlockSize;
     }
diff --git a/klein-storage/klein-storage-facade/src/main/java/com/ofcoder/klein/storage/facade/trace/Tracer.java b/klein-storage/klein-storage-facade/src/main/java/com/ofcoder/klein/storage/facade/trace/Tracer.java
@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.ofcoder.klein.storage.facade.trace;
 
 import java.util.Arrays;
@@ -39,6 +40,10 @@ public Tracer(final String name, final StorageProp op) {
         this.traceManager = ExtensionLoader.getExtensionLoader(TraceManager.class).getJoin();
     }
 
+    /**
+     * append content into trace container.
+     * @param content content
+     */
     public void trace(final String content) {
         if (!curTracer.get().append(content)) {
             renew();
@@ -55,6 +60,9 @@ private void renew() {
         }
     }
 
+    /**
+     * save at shutdown.
+     */
     public void shutdown() {
         renew();
     }
@@ -64,7 +72,7 @@ private static class Content {
         private final String[] trace;
         private final int threshold;
 
-        public Content(final int size) {
+        Content(final int size) {
             if (size < 1) {
                 throw new IllegalArgumentException("Size must be at least 1");
             }
@@ -83,4 +91,4 @@ protected List<String> dump() {
         }
     }
 
-}
+}
diff --git a/klein-storage/klein-storage-file/pom.xml b/klein-storage/klein-storage-file/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <artifactId>klein-storage</artifactId>
         <groupId>com.ofcoder.klein.storage</groupId>
-        <version>0.0.5</version>
+        <version>0.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.ofcoder.klein.storage.file</groupId>
     <artifactId>klein-storage-file</artifactId>
-    <version>0.0.5</version>
+    <version>0.0.6</version>
     <packaging>jar</packaging>
 
     <properties>
diff --git a/klein-storage/klein-storage-file/src/main/java/com/ofcoder/klein/storage/file/FileLogManager.java b/klein-storage/klein-storage-file/src/main/java/com/ofcoder/klein/storage/file/FileLogManager.java
diff --git a/klein-storage/klein-storage-file/src/main/java/com/ofcoder/klein/storage/file/FileTraceManager.java b/klein-storage/klein-storage-file/src/main/java/com/ofcoder/klein/storage/file/FileTraceManager.java
diff --git a/klein-storage/klein-storage-h2/pom.xml b/klein-storage/klein-storage-h2/pom.xml
diff --git a/klein-storage/pom.xml b/klein-storage/pom.xml
diff --git a/pom.xml b/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,7 @@ public void alignData(final NodeState state) {`
`303`	`303`	`}`
`304`	`304`
`305`	`305`	`private boolean handleConfirmRequest(final ConfirmReq req) {`
`306`		`- LOG.info("processing the confirm message from node-{}, instance: {}", req.getNodeId(), req.getInstanceId());`
	`306`	`+ LOG.info("processing the confirm request from node-{}, instance: {}", req.getNodeId(), req.getInstanceId());`
`307`	`307`
`308`	`308`	`if (req.getInstanceId() <= getLastCheckpoint()) {`
`309`	`309`	`// the instance is compressed.`
`@@ -396,7 +396,7 @@ public void applyDone(final Map<Command, Object> result) {`
`396`	`396`	`} else {`
`397`	`397`	`final Endpoint master = memberConfig.getMaster();`
`398`	`398`	`if (master != null) {`
`399`		`- this.dataAligner.diff(instanceId, master, new ApplyAfterLearnCallback(i));`
	`399`	`+ this.dataAligner.diff(i, master, new ApplyAfterLearnCallback(i));`
`400`	`400`	`}`
`401`	`401`	`}`
`402`	`402`	`}`