Merge branch 'feature/sync-mnode-integration' of...

Merge branch 'feature/sync-mnode-integration' of https://github.com/taosdata/TDengine into feature/sync-mnode-integration

source/dnode/mnode/impl/src/mndSync.c

@@ -141,6 +141,7 @@ int32_t mndSyncPropose(SMnode *pMnode, SSdbRaw *pRaw) {
     terrno = TSDB_CODE_APP_ERROR;
   }
 
+  rpcFreeCont(rsp.pCont);
   if (code != 0) return code;
   return pMgmt->errCode;
 }

source/dnode/mnode/impl/src/mndTrans.c

@@ -681,6 +681,7 @@ static int32_t mndTransSync(SMnode *pMnode, STrans *pTrans) {
     return -1;
   }
 
+  sdbFreeRaw(pRaw);
   mDebug("trans:%d, sync finished", pTrans->id);
   return 0;
 }

source/libs/sync/src/syncMain.c

@@ -318,11 +318,8 @@ int32_t syncPropose(int64_t rid, const SRpcMsg* pMsg, bool isWeak) {
   sTrace("syncPropose msgType:%d ", pMsg->msgType);
 
   int32_t    ret = TAOS_SYNC_PROPOSE_SUCCESS;
-  SSyncNode* pSyncNode = (SSyncNode*)taosAcquireRef(tsNodeRefId, rid);
-  if (pSyncNode == NULL) {
-    rpcFreeCont(pMsg->pCont);
-    return TAOS_SYNC_PROPOSE_OTHER_ERROR;
-  }
+  SSyncNode* pSyncNode = taosAcquireRef(tsNodeRefId, rid);
+  if (pSyncNode == NULL) return TAOS_SYNC_PROPOSE_OTHER_ERROR;
 
   assert(rid == pSyncNode->rid);
 
@@ -335,14 +332,13 @@ int32_t syncPropose(int64_t rid, const SRpcMsg* pMsg, bool isWeak) {
     SyncClientRequest* pSyncMsg = syncClientRequestBuild2(pMsg, seqNum, isWeak, pSyncNode->vgId);
     SRpcMsg            rpcMsg;
     syncClientRequest2RpcMsg(pSyncMsg, &rpcMsg);
-    if (pSyncNode->FpEqMsg != NULL) {
-      pSyncNode->FpEqMsg(pSyncNode->msgcb, &rpcMsg);
+
+    if (pSyncNode->FpEqMsg != NULL && (*pSyncNode->FpEqMsg)(pSyncNode->msgcb, &rpcMsg) == 0) {
+      ret = TAOS_SYNC_PROPOSE_SUCCESS;
     } else {
       sTrace("syncPropose pSyncNode->FpEqMsg is NULL");
     }
     syncClientRequestDestroy(pSyncMsg);
-    ret = TAOS_SYNC_PROPOSE_SUCCESS;
-
   } else {
     sTrace("syncPropose not leader, %s", syncUtilState2String(pSyncNode->state));
     ret = TAOS_SYNC_PROPOSE_NOT_LEADER;

tests/script/jenkins/basic.txt

@@ -68,6 +68,7 @@
 ./test.sh -f tsim/stream/basic1.sim
 
 # ---- transaction
+ ./test.sh -f tsim/trans/lossdata1.sim
  ./test.sh -f tsim/trans/create_db.sim
 
 # ---- tmq

tests/script/tsim/trans/lossdata1.sim

+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c transPullupInterval -v 1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+print ======= backup sdbdata
+system sh/exec.sh -n dnode1 -s stop
+system cp ../../../../sim/dnode1/data/mnode/data/sdb.data  ../../../../sim/dnode1/data/mnode/data/sdb.data.bak1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+print =============== create user1
+sql create user user1 PASS 'user1'
+sql create user user2 PASS 'user2'
+sql show users
+if $rows != 3 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop
+
+print ======= restore backup data
+system cp ../../../../sim/dnode1/data/mnode/data/sdb.data.bak1  ../../../../sim/dnode1/data/mnode/data/sdb.data
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+sql show users
+if $rows != 3 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop 
\ No newline at end of file