From b1093b4a791709b28a1c64423f59f4c19f3ed023 Mon Sep 17 00:00:00 2001
From: Minghao Li <castermode@gmail.com>
Date: Mon, 13 Jun 2022 12:13:35 +0800
Subject: [PATCH] fix(sync): use fqdn instead of raftId

---
 source/libs/sync/src/syncMain.c           | 25 +++++++++++-------
 source/libs/sync/test/CMakeLists.txt      | 14 ++++++++++
 source/libs/sync/test/syncRaftIdCheck.cpp | 32 +++++++++++++++++++++++
 3 files changed, 61 insertions(+), 10 deletions(-)
 create mode 100644 source/libs/sync/test/syncRaftIdCheck.cpp

diff --git a/source/libs/sync/src/syncMain.c b/source/libs/sync/src/syncMain.c
index fa61bf1b08..82fde80be2 100644
--- a/source/libs/sync/src/syncMain.c
+++ b/source/libs/sync/src/syncMain.c
@@ -35,7 +35,7 @@
 #include "syncVoteMgr.h"
 #include "tref.h"
 
-bool gRaftDetailLog = false;
+bool gRaftDetailLog = true;
 
 static int32_t tsNodeRefId = -1;
 
@@ -216,25 +216,30 @@ int32_t syncReconfig(int64_t rid, const SSyncCfg* pNewCfg) {
 
   bool IamInNew = false;
   for (int i = 0; i < pNewCfg->replicaNum; ++i) {
-    SRaftId newId;
-    newId.addr = syncUtilAddr2U64((pNewCfg->nodeInfo)[i].nodeFqdn, (pNewCfg->nodeInfo)[i].nodePort);
-    newId.vgId = pSyncNode->vgId;
-
-    sTrace("new[%d]: %lu, %d, my: %lu, %d", i, newId.addr, newId.vgId, pSyncNode->myRaftId.addr, pSyncNode->myRaftId.vgId);
-
-    if (syncUtilSameId(&(pSyncNode->myRaftId), &newId)) {
+    if (strcmp((pNewCfg->nodeInfo)[i].nodeFqdn, pSyncNode->myNodeInfo.nodeFqdn) == 0 &&
+        (pNewCfg->nodeInfo)[i].nodePort == pSyncNode->myNodeInfo.nodePort) {
       IamInNew = true;
     }
+
+    /*
+        // some problem in inet_addr
+
+        SRaftId newId = EMPTY_RAFT_ID;
+        newId.addr = syncUtilAddr2U64((pNewCfg->nodeInfo)[i].nodeFqdn, (pNewCfg->nodeInfo)[i].nodePort);
+        newId.vgId = pSyncNode->vgId;
+
+        if (syncUtilSameId(&(pSyncNode->myRaftId), &newId)) {
+          IamInNew = true;
+        }
+      */
   }
 
- 
   if (!IamInNew) {
     sError("sync reconfig error, not in new config");
     taosReleaseRef(tsNodeRefId, pSyncNode->rid);
     return TAOS_SYNC_NOT_IN_NEW_CONFIG;
   }
 
-
   char* newconfig = syncCfg2Str((SSyncCfg*)pNewCfg);
   if (gRaftDetailLog) {
     sInfo("==syncReconfig== newconfig:%s", newconfig);
diff --git a/source/libs/sync/test/CMakeLists.txt b/source/libs/sync/test/CMakeLists.txt
index d39035ba53..725343e373 100644
--- a/source/libs/sync/test/CMakeLists.txt
+++ b/source/libs/sync/test/CMakeLists.txt
@@ -1,4 +1,5 @@
 add_executable(syncTest "")
+add_executable(syncRaftIdCheck "")
 add_executable(syncEnvTest "")
 add_executable(syncPingTimerTest "")
 add_executable(syncIOTickQTest "")
@@ -54,6 +55,10 @@ target_sources(syncTest
     PRIVATE
     "syncTest.cpp"
 )
+target_sources(syncRaftIdCheck
+    PRIVATE
+    "syncRaftIdCheck.cpp"
+)
 target_sources(syncEnvTest
     PRIVATE
     "syncEnvTest.cpp"
@@ -257,6 +262,11 @@ target_include_directories(syncTest
     "${TD_SOURCE_DIR}/include/libs/sync"
     "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
 )
+target_include_directories(syncRaftIdCheck
+    PUBLIC
+    "${TD_SOURCE_DIR}/include/libs/sync"
+    "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
+)
 target_include_directories(syncEnvTest
     PUBLIC
     "${TD_SOURCE_DIR}/include/libs/sync"
@@ -508,6 +518,10 @@ target_link_libraries(syncTest
     sync
     gtest_main
 )
+target_link_libraries(syncRaftIdCheck
+    sync
+    gtest_main
+)
 target_link_libraries(syncEnvTest
     sync
     gtest_main
diff --git a/source/libs/sync/test/syncRaftIdCheck.cpp b/source/libs/sync/test/syncRaftIdCheck.cpp
new file mode 100644
index 0000000000..f23c0db82b
--- /dev/null
+++ b/source/libs/sync/test/syncRaftIdCheck.cpp
@@ -0,0 +1,32 @@
+#include <gtest/gtest.h>
+#include <stdio.h>
+#include "syncIO.h"
+#include "syncInt.h"
+#include "syncUtil.h"
+
+void usage(char* exe) {
+  printf("Usage: %s host port \n", exe);
+  printf("Usage: %s u64 \n", exe);
+}
+
+int main(int argc, char** argv) {
+  if (argc == 2) {
+    uint64_t u64 = atoll(argv[1]);
+    char     host[128];
+    uint16_t port;
+    syncUtilU642Addr(u64, host, sizeof(host), &port);
+    printf("%s:%d \n", host, port);
+
+  } else if (argc == 3) {
+    uint64_t u64;
+    char*    host = argv[1];
+    uint16_t port = atoi(argv[2]);
+    syncUtilAddr2U64(host, port);
+    printf("%lu \n", u64);
+  } else {
+    usage(argv[0]);
+    exit(-1);
+  }
+
+  return 0;
+}