refactor: sync

source/dnode/mgmt/mgmt_vnode/src/vmWorker.c

@@ -97,7 +97,7 @@ static void vmProcessFetchQueue(SQueueInfo *pInfo, SNodeMsg *pMsg) {
 
 static void vmProcessWriteQueue(SQueueInfo *pInfo, STaosQall *qall, int32_t numOfMsgs) {
   SVnodeObj *pVnode = pInfo->ahandle;
-  int64_t    version;
+  SRpcMsg    rsp;
 
   SArray *pArray = taosArrayInit(numOfMsgs, sizeof(SNodeMsg *));
   if (pArray == NULL) {
@@ -116,13 +116,15 @@ static void vmProcessWriteQueue(SQueueInfo *pInfo, STaosQall *qall, int32_t numO
     }
   }
 
+#if 1
+  int64_t version;
+
   vnodePreprocessWriteReqs(pVnode->pImpl, pArray, &version);
 
   numOfMsgs = taosArrayGetSize(pArray);
   for (int32_t i = 0; i < numOfMsgs; i++) {
     SNodeMsg *pMsg = *(SNodeMsg **)taosArrayGet(pArray, i);
     SRpcMsg  *pRpc = &pMsg->rpcMsg;
-    SRpcMsg   rsp;
 
     rsp.pCont = NULL;
     rsp.contLen = 0;
@@ -132,20 +134,9 @@ static void vmProcessWriteQueue(SQueueInfo *pInfo, STaosQall *qall, int32_t numO
 
     int32_t code = vnodeProcessWriteReq(pVnode->pImpl, pRpc, version++, &rsp);
     tmsgSendRsp(&rsp);
-
-#if 0
-    if (pRsp != NULL) {
-      pRsp->ahandle = pRpc->ahandle;
-      taosMemoryFree(pRsp);
-    } else {
-      if (code != 0 && terrno != 0) code = terrno;
-      vmSendRsp(pVnode->pWrapper, pMsg, code);
-    }
-#endif
   }
-
+#else
   // sync integration response
-  /*
   for (int i = 0; i < taosArrayGetSize(pArray); i++) {
     SNodeMsg *pMsg;
     SRpcMsg  *pRpc;
@@ -153,18 +144,18 @@ static void vmProcessWriteQueue(SQueueInfo *pInfo, STaosQall *qall, int32_t numO
     pMsg = *(SNodeMsg **)taosArrayGet(pArray, i);
     pRpc = &pMsg->rpcMsg;
 
-    // set request version
+    rsp.ahandle = pRpc->ahandle;
-    void *pBuf = POINTER_SHIFT(pRpc->pCont, sizeof(SMsgHead));
+    rsp.handle = pRpc->handle;
-    // int64_t ver = pVnode->pImpl->state.processed++;   // ???????
+    rsp.pCont = NULL;
-    int64_t ver;
+    rsp.contLen = 0;
-    taosEncodeFixedI64(&pBuf, ver);
 
-    int32_t ret = syncPropose(pVnode->pImpl->sync, pRpc, false);
+    int32_t ret = syncPropose(vnodeGetSyncHandle(pVnode->pImpl), pRpc, false);
     if (ret == TAOS_SYNC_PROPOSE_NOT_LEADER) {
-      // not leader
+      rsp.code = -1;
-      // send response
+      tmsgSendRsp(&rsp);
     } else if (ret == TAOS_SYNC_PROPOSE_OTHER_ERROR) {
-      // send response
+      rsp.code = -2;
+      tmsgSendRsp(&rsp);
     } else if (ret == TAOS_SYNC_PROPOSE_SUCCESS) {
       // ok
       // send response in applyQ
@@ -172,7 +163,7 @@ static void vmProcessWriteQueue(SQueueInfo *pInfo, STaosQall *qall, int32_t numO
       assert(0);
     }
   }
-  */
+#endif
 
   for (int32_t i = 0; i < numOfMsgs; i++) {
     SNodeMsg *pMsg = *(SNodeMsg **)taosArrayGet(pArray, i);
@@ -187,13 +178,25 @@ static void vmProcessWriteQueue(SQueueInfo *pInfo, STaosQall *qall, int32_t numO
 static void vmProcessApplyQueue(SQueueInfo *pInfo, STaosQall *qall, int32_t numOfMsgs) {
   SVnodeObj *pVnode = pInfo->ahandle;
   SNodeMsg  *pMsg = NULL;
+  SRpcMsg    rsp;
 
   for (int32_t i = 0; i < numOfMsgs; ++i) {
+#if 0
     taosGetQitem(qall, (void **)&pMsg);
 
-    // todo
+    if (pMsg->rpcMsg.handle != NULL && pMsg->rpcMsg.ahandle != NULL) {
-    SRpcMsg *pRsp = NULL;
+      rsp.ahandle = pMsg->rpcMsg.ahandle;
-    // (void)vnodeProcessWriteReq(pVnode->pImpl, &pMsg->rpcMsg, &pRsp);
+      rsp.handle = pMsg->rpcMsg.handle;
+      rsp.code = 0;
+      rsp.pCont = NULL;
+      rsp.contLen = 0;
+
+      if (vnodeProcessWriteReq(pVnode->pImpl, &pMsg->rpcMsg, &rsp) < 0) {
+        rsp.code = terrno;
+        tmsgSendRsp(&rsp);
+      }
+    }
+#endif
   }
 }
 

source/dnode/vnode/inc/vnode.h

@@ -21,10 +21,10 @@
 #include "tqueue.h"
 #include "trpc.h"
 
+#include "sync.h"
 #include "tarray.h"
 #include "tfs.h"
 #include "wal.h"
-#include "sync.h"
 
 #include "tcommon.h"
 #include "tfs.h"
@@ -61,6 +61,8 @@ int32_t vnodeSync(SVnode *pVnode);
 int32_t vnodeGetLoad(SVnode *pVnode, SVnodeLoad *pLoad);
 int     vnodeValidateTableHash(SVnodeCfg *pVnodeOptions, char *tableFName);
 
+int64_t vnodeGetSyncHandle(SVnode *pVnode);
+
 // meta
 typedef struct SMeta      SMeta;  // todo: remove
 typedef struct SMTbCursor SMTbCursor;
@@ -148,7 +150,7 @@ struct SVnodeCfg {
   bool     isWeak;
   STsdbCfg tsdbCfg;
   SWalCfg  walCfg;
-  SSyncCfg syncCfg; // sync integration
+  SSyncCfg syncCfg;  // sync integration
   uint32_t hashBegin;
   uint32_t hashEnd;
   int8_t   hashMethod;

source/dnode/vnode/src/inc/vnodeInt.h

@@ -54,8 +54,8 @@ typedef struct SQWorkerMgmt SQHandle;
 
 #define VNODE_META_DIR "meta"
 #define VNODE_TSDB_DIR "tsdb"
-#define VNODE_TQ_DIR "tq"
+#define VNODE_TQ_DIR   "tq"
-#define VNODE_WAL_DIR "wal"
+#define VNODE_WAL_DIR  "wal"
 
 typedef struct {
   int8_t  streamType;  // sma or other

source/dnode/vnode/src/vnd/vnodeOpen.c

@@ -165,3 +165,5 @@ void vnodeClose(SVnode *pVnode) {
     taosMemoryFree(pVnode);
   }
 }
+
+int64_t vnodeGetSyncHandle(SVnode *pVnode) { return pVnode->sync; }