加入vscode调试方式

.vscode/launch.json

@@ -0,0 +1,18 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "java",
+            "name": "Launch Server",
+            "request": "launch",
+            "mainClass": "com.yuandian.dataflow.Server",
+            "projectName": "dataflow",
+            "args": "2",
+            "preLaunchTask": "restart",
+            "postDebugTask": "stopall",
+        } 
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "java.configuration.updateBuildConfiguration": "automatic"
+}

.vscode/tasks.json

@@ -0,0 +1,27 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "restart",
+            "type": "shell",
+            "command": "sh restart.sh",
+            "presentation": {
+                "echo": true,
+                "reveal": "always",
+                "focus": false,
+                "panel": "shared",
+                "showReuseMessage": true,
+                "clear": false,
+                "close": true
+            }
+        },
+        {
+            "label": "stopall",
+            "type": "shell",
+            "command": "sh stop.sh",
+            "presentation": {
+                "close": true
+            }
+        }
+    ]
+}

restart.sh

@@ -1,2 +1,2 @@
 #! /bin/bash
-sh stop.sh & rm raftdata/ -rf && mvn -T4 package  && truncate -s 0 screenlog.0 && sh start.sh
+sh stop.sh & rm raftdata/ -rf && mvn package  && truncate -s 0 screenlog.0 && sh start.sh

src/main/java/com/yuandian/dataflow/controller/PacketsProcessor.java

@@ -53,15 +53,24 @@ public class PacketsProcessor implements RpcProcessor<PacketsProcessor.PacketsRe
     public void handleRequest(RpcContext rpcCtx, PacketsRequest request) {
             // StateServerFactory.getStateServer().updateFsmStateAsync(s, onCompleted);
 
+            var resp = new RaftResponse<>();
+            resp.setSuccess(true);
+            rpcCtx.sendResponse(resp);
+ 
             var ss = StateServerFactory.getStateServer();
-            log.info("{} handler request.packets.size(): {}", StateServerFactory.getServerId(), request.packets.size());
+            log.debug("{} handler request.packets.size(): {}", StateServerFactory.getServerId(), request.packets.size());
+
+            
             ss.readIndexState( new GenericClosure<State>() {
 
                 @Override
                 public void run(Status status) {
-                    
+                    log.debug("status {}", status);
+                    if(status.isOk()) {
                         var state = this.getValue();
                         var ws = state.getWorkers().get(StateServerFactory.getServerId());
+
+
                         ws.setTaskQueueSize( ws.getTaskQueueSize() - request.packets.size());
                         ws.setUpdateAt(Instant.now());
         
@@ -70,19 +79,15 @@ public class PacketsProcessor implements RpcProcessor<PacketsProcessor.PacketsRe
                         Operate.CallOperate(new Operate(OperateType.PUT,ws), new GenericClosure<Operate>() {
                             @Override
                             public void run(Status status) {
-                            var resp = this.getResponse();
-                            resp.setMsg(rpcCtx.getRemoteAddress());
                                 if(status.isOk()) {
-                                resp.setSuccess(true);
                                     log.info("{}", resp);
-                            } else {
-                                resp.setSuccess(false);
                                 }  
-                            rpcCtx.sendResponse(resp);
                             }
                         });
                     }
                   
+                }
+                
             } );
             
             

src/main/java/com/yuandian/dataflow/statemachine/StateMachine.java

@@ -38,7 +38,8 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 public class StateMachine extends StateMachineAdapter {
 
-    // private static final Logger LOG = LoggerFactory.getLogger(StateMachine.class);
+    // private static final Logger LOG =
+    // LoggerFactory.getLogger(StateMachine.class);
 
     /**
      * State value 全局使用的唯一状态
@@ -70,7 +71,7 @@ public class StateMachine extends StateMachineAdapter {
             if (iter.done() != null) {
                 // This task is applied by this node, get value from closure to avoid additional
                 // parsing.
-                closure = (GenericClosure<Operate>)iter.done(); // 只支持单一个State. 全状态机只支持一种提交
+                closure = (GenericClosure<Operate>) iter.done(); // 只支持单一个State. 全状态机只支持一种提交
                 op = closure.getValue();
 
             } else {
@@ -78,25 +79,27 @@ public class StateMachine extends StateMachineAdapter {
                 final ByteBuffer data = iter.getData();
                 try {
 
-                op = SerializerManager.getSerializer(SerializerManager.Hessian2).deserialize(data.array(),Operate.class.getName());
+                    op = SerializerManager.getSerializer(SerializerManager.Hessian2).deserialize(
+                            data.array(),
+                            Operate.class.getName());
                 } catch (CodecException e) {
                     log.info("{}", e.toString());
                 }
 
             }
 
-            if(op != null) {
+            if (op != null) {
-                switch(op.getType()) {
+                switch (op.getType()) {
                     case PUT:
                         WorkerState ws = op.getValue();
                         state.getWorkers().put(ws.peerId, ws);
-                        if(closure != null) {
+                        if (closure != null) {
                             closure.success(op);
                             closure.run(Status.OK());
                         }
                         break;
                     case REMOVE:
-                        if(closure != null) {
+                        if (closure != null) {
                             closure.success(op);
                             closure.run(Status.OK());
                         }
@@ -109,8 +112,6 @@ public class StateMachine extends StateMachineAdapter {
 
             }
 
-
-
             iter.next();
         }
     }
@@ -136,18 +137,18 @@ public class StateMachine extends StateMachineAdapter {
         this.leaderTerm.set(term);
 
         // 判断是否Master线程还在跑, 如果存在则中断
-        if(MasterFactory.getMasterExecute().isAlive()) {  
+        if (MasterFactory.getMasterExecute().isAlive()) {
             MasterFactory.getMasterExecute().interrupt();
         }
 
         var ss = StateServerFactory.getStateServer();
-        ss.readIndexState( new GenericClosure<State>() {
+        ss.readIndexState(new GenericClosure<State>() {
 
             @Override
             public void run(Status status) {
 
-                var ws = state.getWorkers().get( StateServerFactory.getServerId() );
+                var ws = state.getWorkers().get(StateServerFactory.getServerId());
-                if(ws == null) {
+                if (ws == null) {
                     ws = new WorkerState(StateServerFactory.getServerId());
                 }
 
@@ -175,34 +176,30 @@ public class StateMachine extends StateMachineAdapter {
         super.onLeaderStop(status);
 
         // 判断是否Master线程还在跑, 如果存在则中断
-        if(MasterFactory.getMasterExecute().isAlive()) {
+        if (MasterFactory.getMasterExecute().isAlive()) {
             MasterFactory.getMasterExecute().interrupt();
         }
 
-  
     }
 
-    
-
     @Override
     public void onShutdown() {
         log.debug("onShutdown");
         super.onShutdown();
     }
 
-
     @Override
     public void onStartFollowing(LeaderChangeContext ctx) {
         log.debug("[onStartFollowing] {} {}", ctx, StateServerFactory.getCluster().getServerId());
         try {
 
             // 判断是否Master线程还在跑, 如果存在则中断
-            if(MasterFactory.getMasterExecute().isAlive()) {
+            if (MasterFactory.getMasterExecute().isAlive()) {
                 MasterFactory.getMasterExecute().interrupt();
             }
 
             var ws = new WorkerState(StateServerFactory.getServerId());
-            log.debug("my: {} leader id {}",StateServerFactory.getServerId(), StateServerFactory.getLeaderId());
+            log.debug("my: {} leader id {}", StateServerFactory.getServerId(), StateServerFactory.getLeaderId());
 
             var op = new Operate(OperateType.PUT, ws);
 
@@ -228,12 +225,12 @@ public class StateMachine extends StateMachineAdapter {
 
     @Override
     public void onStopFollowing(LeaderChangeContext ctx) {
-        log.debug("{} {}",ctx, StateServerFactory.getCluster().getServerId());
+        log.debug("{} {}", ctx, StateServerFactory.getCluster().getServerId());
 
         var ss = StateServerFactory.getStateServer();
         var ws = new WorkerState(StateServerFactory.getServerId());
 
-        log.debug("my: {} leader id {}",StateServerFactory.getServerId(), StateServerFactory.getLeaderId());
+        log.debug("my: {} leader id {}", StateServerFactory.getServerId(), StateServerFactory.getLeaderId());
 
         var op = new Operate(OperateType.PUT, ws);
         Operate.CallOperate(op, new GenericClosure() {
@@ -243,14 +240,7 @@ public class StateMachine extends StateMachineAdapter {
             }
         });
 
-
         super.onStopFollowing(ctx);
     }
 
- 
-
-   
-
-
-
 }

src/main/java/com/yuandian/dataflow/statemachine/StateServerFactory.java

@@ -188,17 +188,18 @@ public class StateServerFactory {
         getNode().readIndex(BytesUtil.EMPTY_BYTES,  new ReadIndexClosure() {
             @Override
             public void run(Status status, long index, byte[] reqCtx) {
-                if( status.isOk()) {
+                if(status.isOk()) {
+                    // 回调失败 
                     closure.success(ss.fsm.getState());
-                    closure.run(status);
                 } 
+                closure.run(status);
             }
         } );
     }
     
  
 
-    public void applyOperate(Operate op, GenericClosure closure) {
+    public void applyOperate(Operate op, GenericClosure<Operate> closure) {
         // 所有的提交都必须再leader进行
         if (!ss.isLeader()) {
             ss.handlerNotLeaderError(closure);

src/main/java/com/yuandian/dataflow/statemachine/operate/Operate.java

@@ -2,6 +2,7 @@ package com.yuandian.dataflow.statemachine.operate;
 
 import java.io.Serializable;
 
+import com.alipay.sofa.jraft.Status;
 import com.alipay.sofa.jraft.error.RemotingException;
 import com.alipay.sofa.jraft.rpc.InvokeCallback;
 import com.yuandian.dataflow.statemachine.StateServerFactory;
@@ -75,6 +76,7 @@ public class Operate implements Serializable {
                             var resp = (RaftResponse<Operate>) result;
                             closure.setResponse(resp);
                             closure.success(resp.getValue());
+                            closure.run(Status.OK());
                         }
 
                     }, 5000);

src/main/java/com/yuandian/dataflow/statemachine/rpc/OperateProcessor.java

@@ -64,7 +64,7 @@ public class OperateProcessor implements RpcProcessor<OperateProcessor.OperateRe
    
         log.info("request: {}", request);
  
-        final GenericClosure   closure = new GenericClosure() {
+        final GenericClosure<Operate> closure = new GenericClosure<Operate>() {
             @Override
             public void run(Status status) {
                 rpcCtx.sendResponse(getResponse());

src/main/java/com/yuandian/dataflow/utils/Utils.java

@@ -0,0 +1,8 @@
+package com.yuandian.dataflow.utils;
+
+public class Utils {
+ 
+    public static void main(String[] args) {
+         
+    }
+}

start.sh

@@ -10,10 +10,10 @@ sleep 1
 
 screen  -dmS raft-0 -L  java -jar  target/dataflow-${VERSION}.jar 0  
 screen  -dmS raft-1 -L  java -jar  target/dataflow-${VERSION}.jar 1  
-screen  -dmS raft-2 -L  java -jar  target/dataflow-${VERSION}.jar 2  
+# screen  -dmS raft-2 -L  java -jar  target/dataflow-${VERSION}.jar 2  
 
 sleep 1
 
 screen  -S raft-0 -X logfile flush 0
 screen  -S raft-1 -X logfile flush 0
-screen  -S raft-2 -X logfile flush 0
+# screen  -S raft-2 -X logfile flush 0 

stop.sh

@@ -2,3 +2,4 @@
 screen -S raft-0 -X quit
 screen -S raft-1 -X quit
 screen -S raft-2 -X quit
+exit 0