From 3139aaef0502033d98a2e4266059bd20a700b3d5 Mon Sep 17 00:00:00 2001
From: Minghao Li <castermode@gmail.com>
Date: Mon, 21 Mar 2022 20:06:57 +0800
Subject: [PATCH] sync refactor

---
 source/libs/sync/inc/syncIO.h            |  2 +-
 source/libs/sync/test/syncElectTest.cpp  |  1 +
 source/libs/sync/test/syncElectTest2.cpp | 14 +++++++-------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/source/libs/sync/inc/syncIO.h b/source/libs/sync/inc/syncIO.h
index 0185d5f211..99f9deb99e 100644
--- a/source/libs/sync/inc/syncIO.h
+++ b/source/libs/sync/inc/syncIO.h
@@ -35,7 +35,7 @@ extern "C" {
 typedef struct SSyncIO {
   STaosQueue *pMsgQ;
   STaosQset * pQset;
-  TdThread   consumerTid;
+  TdThread    consumerTid;
 
   void * serverRpc;
   void * clientRpc;
diff --git a/source/libs/sync/test/syncElectTest.cpp b/source/libs/sync/test/syncElectTest.cpp
index 47f55aa660..99cfe75867 100644
--- a/source/libs/sync/test/syncElectTest.cpp
+++ b/source/libs/sync/test/syncElectTest.cpp
@@ -120,6 +120,7 @@ int main(int argc, char** argv) {
         "elect sleep, state: %d, %s, term:%lu electTimerLogicClock:%lu, electTimerLogicClockUser:%lu, electTimerMS:%d",
         gSyncNode->state, syncUtilState2String(gSyncNode->state), gSyncNode->pRaftStore->currentTerm,
         gSyncNode->electTimerLogicClock, gSyncNode->electTimerLogicClockUser, gSyncNode->electTimerMS);
+    taosMsleep(1000);
   }
 
   return 0;
diff --git a/source/libs/sync/test/syncElectTest2.cpp b/source/libs/sync/test/syncElectTest2.cpp
index 6113c37fec..8463ffd448 100644
--- a/source/libs/sync/test/syncElectTest2.cpp
+++ b/source/libs/sync/test/syncElectTest2.cpp
@@ -21,10 +21,10 @@ uint16_t ports[] = {7010, 7110, 7210, 7310, 7410};
 int32_t  replicaNum = 3;
 int32_t  myIndex = 0;
 
-SRaftId    ids[TSDB_MAX_REPLICA];
-SSyncInfo  syncInfo;
-SSyncFSM*  pFsm;
-SWal*      pWal;
+SRaftId   ids[TSDB_MAX_REPLICA];
+SSyncInfo syncInfo;
+SSyncFSM* pFsm;
+SWal*     pWal;
 
 int64_t syncNodeInit() {
   syncInfo.vgId = 1234;
@@ -33,7 +33,7 @@ int64_t syncNodeInit() {
   syncInfo.queue = gSyncIO->pMsgQ;
   syncInfo.FpEqMsg = syncIOEqMsg;
   syncInfo.pFsm = pFsm;
-  snprintf(syncInfo.path, sizeof(syncInfo.path), "./elect_test_%d", myIndex);
+  snprintf(syncInfo.path, sizeof(syncInfo.path), "./elect2_test_%d", myIndex);
 
   int code = walInit();
   assert(code == 0);
@@ -48,7 +48,7 @@ int64_t syncNodeInit() {
   walCfg.level = TAOS_WAL_FSYNC;
 
   char tmpdir[128];
-  snprintf(tmpdir, sizeof(tmpdir), "./elect_test_wal_%d", myIndex);
+  snprintf(tmpdir, sizeof(tmpdir), "./elect2_test_wal_%d", myIndex);
   pWal = walOpen(tmpdir, &walCfg);
   assert(pWal != NULL);
 
@@ -64,7 +64,6 @@ int64_t syncNodeInit() {
     // taosGetFqdn(pCfg->nodeInfo[0].nodeFqdn);
   }
 
-
   int64_t rid = syncStart(&syncInfo);
   assert(rid > 0);
 
@@ -127,6 +126,7 @@ int main(int argc, char** argv) {
         "elect sleep, state: %d, %s, term:%lu electTimerLogicClock:%lu, electTimerLogicClockUser:%lu, electTimerMS:%d",
         pSyncNode->state, syncUtilState2String(pSyncNode->state), pSyncNode->pRaftStore->currentTerm,
         pSyncNode->electTimerLogicClock, pSyncNode->electTimerLogicClockUser, pSyncNode->electTimerMS);
+    taosMsleep(1000);
   }
 
   syncNodeRelease(pSyncNode);
-- 
GitLab