Merge pull request #14951 from taosdata/fix/dnode

refactor: get retry epset from sync module only when mnode is not ini…

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

@@ -218,7 +218,6 @@ bool mndIsMnode(SMnode *pMnode, int32_t dnodeId) {
 }
 
 void mndGetMnodeEpSet(SMnode *pMnode, SEpSet *pEpSet) {
-#if 0  
   SSdb   *pSdb = pMnode->pSdb;
   int32_t totalMnodes = sdbGetSize(pSdb, SDB_MNODE);
   void   *pIter = NULL;
@@ -238,9 +237,10 @@ void mndGetMnodeEpSet(SMnode *pMnode, SEpSet *pEpSet) {
     addEpIntoEpSet(pEpSet, pObj->pDnode->fqdn, pObj->pDnode->port);
     sdbRelease(pSdb, pObj);
   }
-#else
-  syncGetRetryEpSet(pMnode->syncMgmt.sync, pEpSet);
-#endif
+
+  if (pEpSet->numOfEps == 0) {
+    syncGetRetryEpSet(pMnode->syncMgmt.sync, pEpSet);
+  }
 }
 
 static int32_t mndSetCreateMnodeRedoLogs(SMnode *pMnode, STrans *pTrans, SMnodeObj *pObj) {

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

@@ -56,23 +56,24 @@ void mndSyncCommitMsg(struct SSyncFSM *pFsm, const SRpcMsg *pMsg, SFsmCbMeta cbM
     sdbSetApplyInfo(pMnode->pSdb, cbMeta.index, cbMeta.term, cbMeta.lastConfigIndex);
   }
 
-  if (pMgmt->transId == transId && transId != 0) {
+  if (transId <= 0) {
+    mError("trans:%d, invalid commit msg", transId);
+  } else if (transId == pMgmt->transId) {
     if (pMgmt->errCode != 0) {
       mError("trans:%d, failed to propose since %s", transId, tstrerror(pMgmt->errCode));
     }
     pMgmt->transId = 0;
     tsem_post(&pMgmt->syncSem);
   } else {
-#if 1
-    mError("trans:%d, invalid commit msg since trandId not match with %d", transId, pMgmt->transId);
-#else
     STrans *pTrans = mndAcquireTrans(pMnode, transId);
     if (pTrans != NULL) {
+      mDebug("trans:%d, execute in mnode which not leader", transId);
       mndTransExecute(pMnode, pTrans);
       mndReleaseTrans(pMnode, pTrans);
+      // sdbWriteFile(pMnode->pSdb, SDB_WRITE_DELTA);
+    } else {
+      mError("trans:%d, not found while execute in mnode since %s", transId, terrstr());
     }
-    // sdbWriteFile(pMnode->pSdb, SDB_WRITE_DELTA);
-#endif
   }
 }