Merge branch 'fix/TD-20052_2' into fix/TD-20052

source/libs/sync/inc/syncMessage.h

@@ -115,17 +115,6 @@ void syncAppendEntriesPrint2(char* s, const SyncAppendEntries* pMsg);
 void syncAppendEntriesLog(const SyncAppendEntries* pMsg);
 void syncAppendEntriesLog2(char* s, const SyncAppendEntries* pMsg);
 
-// ---------------------------------------------
-
-typedef struct SOffsetAndContLen {
-  int32_t offset;
-  int32_t contLen;
-} SOffsetAndContLen;
-
-// data:
-// block1: SOffsetAndContLen Array
-// block2: entry Array
-
 typedef struct SyncAppendEntriesReply {
   uint32_t bytes;
   int32_t  vgId;

source/libs/sync/src/syncMain.c

@@ -1654,7 +1654,7 @@ void syncNodeVoteForSelf(SSyncNode* pSyncNode) {
 
   SRpcMsg rpcMsg = {0};
   int32_t ret = syncBuildRequestVoteReply(&rpcMsg, pSyncNode->vgId);
-  if (ret == 0) return;
+  if (ret != 0) return;
 
   SyncRequestVoteReply* pMsg = rpcMsg.pCont;
   pMsg->srcId = pSyncNode->myRaftId;

source/libs/sync/src/syncRequestVote.c

@@ -141,7 +141,7 @@ int32_t syncNodeOnRequestVote(SSyncNode* ths, const SRpcMsg* pRpcMsg) {
   // send msg
   SRpcMsg rpcMsg = {0};
   ret = syncBuildRequestVoteReply(&rpcMsg, ths->vgId);
-  ASSERT(ret);
+  ASSERT(ret == 0 );
 
   SyncRequestVoteReply* pReply = rpcMsg.pCont;
   pReply->srcId = ths->myRaftId;

source/libs/sync/test/sync_test_lib/inc/syncBatch.h

@@ -58,6 +58,15 @@ void syncClientRequestBatchPrint2(char* s, const SyncClientRequestBatch* pMsg);
 void syncClientRequestBatchLog(const SyncClientRequestBatch* pMsg);
 void syncClientRequestBatchLog2(char* s, const SyncClientRequestBatch* pMsg);
 
+typedef struct SOffsetAndContLen {
+  int32_t offset;
+  int32_t contLen;
+} SOffsetAndContLen;
+
+// data:
+// block1: SOffsetAndContLen Array
+// block2: entry Array
+
 typedef struct SyncAppendEntriesBatch {
   uint32_t bytes;
   int32_t  vgId;