From be06f24c46df4fd5f4f1f23593db22d4dc2a7533 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Sat, 25 Dec 2021 16:05:18 +0800
Subject: [PATCH] minor changes

---
 source/dnode/mgmt/impl/src/dndVnodes.c |  4 ++--
 source/dnode/mnode/impl/inc/mndDef.h   |  1 +
 source/dnode/mnode/impl/src/mndStb.c   |  2 +-
 source/dnode/mnode/impl/src/mndTrans.c | 10 +++++-----
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/source/dnode/mgmt/impl/src/dndVnodes.c b/source/dnode/mgmt/impl/src/dndVnodes.c
index 351fc20784..00b7883d5b 100644
--- a/source/dnode/mgmt/impl/src/dndVnodes.c
+++ b/source/dnode/mgmt/impl/src/dndVnodes.c
@@ -822,12 +822,12 @@ static void dndProcessVnodeWriteQueue(SVnodeObj *pVnode, taos_qall qall, int32_t
     assert(ptr != NULL);
   }
 
-  vnodeProcessWMsgs(pVnode->pImpl, pArray);
+  //vnodeProcessWMsgs(pVnode->pImpl, pArray);
 
   for (size_t i = 0; i < numOfMsgs; i++) {
     SRpcMsg *pRsp = NULL;
     SRpcMsg *pMsg = *(SRpcMsg **)taosArrayGet(pArray, i);
-    int32_t  code = vnodeApplyWMsg(pVnode->pImpl, pMsg, &pRsp);
+    int32_t  code = 0; //vnodeApplyWMsg(pVnode->pImpl, pMsg, &pRsp);
     if (pRsp != NULL) {
       pRsp->ahandle = pMsg->ahandle;
       rpcSendResponse(pRsp);
diff --git a/source/dnode/mnode/impl/inc/mndDef.h b/source/dnode/mnode/impl/inc/mndDef.h
index b21dc0841c..c6fb0cce1d 100644
--- a/source/dnode/mnode/impl/inc/mndDef.h
+++ b/source/dnode/mnode/impl/inc/mndDef.h
@@ -95,6 +95,7 @@ typedef struct {
   int32_t    id;
   ETrnStage  stage;
   ETrnPolicy policy;
+  int32_t    retryTimes;
   void      *rpcHandle;
   void      *rpcAHandle;
   SArray    *redoLogs;
diff --git a/source/dnode/mnode/impl/src/mndStb.c b/source/dnode/mnode/impl/src/mndStb.c
index e5acb6024e..9421f1b20d 100644
--- a/source/dnode/mnode/impl/src/mndStb.c
+++ b/source/dnode/mnode/impl/src/mndStb.c
@@ -374,7 +374,7 @@ static int32_t mndSetCreateStbRedoActions(SMnode *pMnode, STrans *pTrans, SDbObj
     STransAction action = {0};
     action.epSet = mndGetVgroupEpset(pMnode, pVgroup);
     action.pCont = pMsg;
-    action.contLen = htonl(contLen);
+    action.contLen = contLen;
     action.msgType = TDMT_VND_CREATE_STB;
     if (mndTransAppendRedoAction(pTrans, &action) != 0) {
       free(pMsg);
diff --git a/source/dnode/mnode/impl/src/mndTrans.c b/source/dnode/mnode/impl/src/mndTrans.c
index f63d14e711..1697936a26 100644
--- a/source/dnode/mnode/impl/src/mndTrans.c
+++ b/source/dnode/mnode/impl/src/mndTrans.c
@@ -39,7 +39,7 @@ static int32_t mndTransExecuteUndoLogs(SMnode *pMnode, STrans *pTrans);
 static int32_t mndTransExecuteCommitLogs(SMnode *pMnode, STrans *pTrans);
 static int32_t mndTransExecuteRedoActions(SMnode *pMnode, STrans *pTrans);
 static int32_t mndTransExecuteUndoActions(SMnode *pMnode, STrans *pTrans);
-static int32_t mndTransPerformPrepareStage(SMnode *pMnode, STrans *pTrans);
+static void    mndTransPerformPrepareStage(SMnode *pMnode, STrans *pTrans);
 static int32_t mndTransPerformExecuteStage(SMnode *pMnode, STrans *pTrans);
 static int32_t mndTransPerformCommitStage(SMnode *pMnode, STrans *pTrans);
 static int32_t mndTransPerformRollbackStage(SMnode *pMnode, STrans *pTrans);
@@ -714,7 +714,7 @@ static int32_t mndTransExecuteUndoActions(SMnode *pMnode, STrans *pTrans) {
   return mndTransExecuteActions(pMnode, pTrans, pTrans->undoActions);
 }
 
-static int32_t mndTransPerformPrepareStage(SMnode *pMnode, STrans *pTrans) {
+static void mndTransPerformPrepareStage(SMnode *pMnode, STrans *pTrans) {
   int32_t code = mndTransExecuteRedoLogs(pMnode, pTrans);
 
   if (code == 0) {
@@ -724,8 +724,6 @@ static int32_t mndTransPerformPrepareStage(SMnode *pMnode, STrans *pTrans) {
     pTrans->stage = TRN_STAGE_ROLLBACK;
     mError("trans:%d, stage from prepare to rollback since %s", pTrans->id, terrstr());
   }
-
-  return 0;
 }
 
 static int32_t mndTransPerformExecuteStage(SMnode *pMnode, STrans *pTrans) {
@@ -742,6 +740,7 @@ static int32_t mndTransPerformExecuteStage(SMnode *pMnode, STrans *pTrans) {
       mError("trans:%d, stage from execute to rollback since %s", pTrans->id, terrstr());
     } else {
       pTrans->stage = TRN_STAGE_EXECUTE;
+      pTrans->retryTimes++;
       mError("trans:%d, stage keep on execute since %s", pTrans->id, terrstr());
     }
   }
@@ -762,6 +761,7 @@ static int32_t mndTransPerformRollbackStage(SMnode *pMnode, STrans *pTrans) {
     mDebug("trans:%d, rollbacked", pTrans->id);
   } else {
     pTrans->stage = TRN_STAGE_ROLLBACK;
+    pTrans->retryTimes++;
     mError("trans:%d, stage keep on rollback since %s", pTrans->id, terrstr());
   }
 
@@ -774,7 +774,7 @@ static void mndTransExecute(SMnode *pMnode, STrans *pTrans) {
   while (code == 0) {
     switch (pTrans->stage) {
       case TRN_STAGE_PREPARE:
-        code = mndTransPerformPrepareStage(pMnode, pTrans);
+        mndTransPerformPrepareStage(pMnode, pTrans);
         break;
       case TRN_STAGE_EXECUTE:
         code = mndTransPerformExecuteStage(pMnode, pTrans);