From e0332e9c124282dd5f4f1836fe7af5c2a3523701 Mon Sep 17 00:00:00 2001
From: Minghao Li <castermode@gmail.com>
Date: Tue, 19 Apr 2022 22:04:02 +0800
Subject: [PATCH] sync integration

---
 source/dnode/vnode/src/inc/vnodeSync.h |  2 +-
 source/dnode/vnode/src/vnd/vnodeCfg.c  | 27 ++++++++++++++++++++++++++
 source/dnode/vnode/src/vnd/vnodeOpen.c |  2 +-
 source/dnode/vnode/src/vnd/vnodeSync.c |  4 ++--
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/source/dnode/vnode/src/inc/vnodeSync.h b/source/dnode/vnode/src/inc/vnodeSync.h
index 6bbdc4ae72..fea94c4607 100644
--- a/source/dnode/vnode/src/inc/vnodeSync.h
+++ b/source/dnode/vnode/src/inc/vnodeSync.h
@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-int32_t vnodeSyncOpen(SVnode *pVnode);
+int32_t vnodeSyncOpen(SVnode *pVnode, char *path);
 int32_t vnodeSyncStart(SVnode *pVnode);
 void    vnodeSyncClose(SVnode *pVnode);
 
diff --git a/source/dnode/vnode/src/vnd/vnodeCfg.c b/source/dnode/vnode/src/vnd/vnodeCfg.c
index 625a2b3aed..0f8bab7856 100644
--- a/source/dnode/vnode/src/vnd/vnodeCfg.c
+++ b/source/dnode/vnode/src/vnd/vnodeCfg.c
@@ -82,6 +82,18 @@ int vnodeEncodeConfig(const void *pObj, SJson *pJson) {
   if (tjsonAddIntegerToObject(pJson, "hashEnd", pCfg->hashEnd) < 0) return -1;
   if (tjsonAddIntegerToObject(pJson, "hashMethod", pCfg->hashMethod) < 0) return -1;
 
+  // sync integration
+  if (tjsonAddIntegerToObject(pJson, "syncCfg.replicaNum", pCfg->syncCfg.replicaNum) < 0) return -1;
+  if (tjsonAddIntegerToObject(pJson, "syncCfg.myIndex", pCfg->syncCfg.myIndex) < 0) return -1;
+  SJson *pNodeInfoArr = tjsonCreateArray();
+  tjsonAddItemToObject(pJson, "syncCfg.nodeInfo", pNodeInfoArr);
+  for (int i = 0; i < pCfg->syncCfg.replicaNum; ++i) {
+    SJson *pNodeInfo = tjsonCreateObject();
+    tjsonAddIntegerToObject(pNodeInfo, "nodePort", (pCfg->syncCfg.nodeInfo)[i].nodePort);
+    tjsonAddStringToObject(pNodeInfo, "nodeFqdn", (pCfg->syncCfg.nodeInfo)[i].nodeFqdn);
+    tjsonAddItemToArray(pNodeInfoArr, pNodeInfo);
+  }
+
   return 0;
 }
 
@@ -120,6 +132,21 @@ int vnodeDecodeConfig(const SJson *pJson, void *pObj) {
   if (tjsonGetNumberValue(pJson, "hashEnd", pCfg->hashEnd) < 0) return -1;
   if (tjsonGetNumberValue(pJson, "hashMethod", pCfg->hashMethod) < 0) return -1;
 
+  // sync integration
+  if (tjsonGetNumberValue(pJson, "syncCfg.replicaNum", pCfg->syncCfg.replicaNum) < 0) return -1;
+  if (tjsonGetNumberValue(pJson, "syncCfg.myIndex", pCfg->syncCfg.myIndex) < 0) return -1;
+
+  SJson *pNodeInfoArr = tjsonGetObjectItem(pJson, "syncCfg.nodeInfo");
+  int    arraySize = tjsonGetArraySize(pNodeInfoArr);
+  assert(arraySize == pCfg->syncCfg.replicaNum);
+
+  for (int i = 0; i < arraySize; ++i) {
+    cJSON *pNodeInfo = tjsonGetArrayItem(pNodeInfoArr, i);
+    assert(pNodeInfo != NULL);
+    tjsonGetNumberValue(pNodeInfo, "nodePort", (pCfg->syncCfg.nodeInfo)[i].nodePort);
+    tjsonGetStringValue(pNodeInfo, "nodeFqdn", (pCfg->syncCfg.nodeInfo)[i].nodeFqdn);
+  }
+
   return 0;
 }
 
diff --git a/source/dnode/vnode/src/vnd/vnodeOpen.c b/source/dnode/vnode/src/vnd/vnodeOpen.c
index ae5c99ff03..30eb9e2a42 100644
--- a/source/dnode/vnode/src/vnd/vnodeOpen.c
+++ b/source/dnode/vnode/src/vnd/vnodeOpen.c
@@ -126,7 +126,7 @@ SVnode *vnodeOpen(const char *path, STfs *pTfs, SMsgCb msgCb) {
 
   // sync integration
   // open sync
-  if (vnodeSyncOpen(pVnode)) {
+  if (vnodeSyncOpen(pVnode, dir)) {
     goto _err;
   }
 
diff --git a/source/dnode/vnode/src/vnd/vnodeSync.c b/source/dnode/vnode/src/vnd/vnodeSync.c
index e0e421b95c..4db483851e 100644
--- a/source/dnode/vnode/src/vnd/vnodeSync.c
+++ b/source/dnode/vnode/src/vnd/vnodeSync.c
@@ -20,7 +20,7 @@
 
 // sync integration
 
-int32_t vnodeSyncOpen(SVnode *pVnode) {
+int32_t vnodeSyncOpen(SVnode *pVnode, char *path) {
   SSyncInfo syncInfo;
   syncInfo.vgId = pVnode->config.vgId;
   SSyncCfg *pCfg = &(syncInfo.syncCfg);
@@ -28,7 +28,7 @@ int32_t vnodeSyncOpen(SVnode *pVnode) {
   pCfg->myIndex = pVnode->config.syncCfg.myIndex;
   memcpy(pCfg->nodeInfo, pVnode->config.syncCfg.nodeInfo, sizeof(pCfg->nodeInfo));
 
-  snprintf(syncInfo.path, sizeof(syncInfo.path), "%s/sync", pVnode->path);
+  snprintf(syncInfo.path, sizeof(syncInfo.path), "%s/sync", path);
   syncInfo.pWal = pVnode->pWal;
 
   syncInfo.pFsm = syncVnodeMakeFsm(pVnode);
-- 
GitLab