sync modify timer

source/libs/sync/inc/syncMessage.h

@@ -30,7 +30,7 @@ extern "C" {
 
 // encode as uint64
 typedef enum ESyncMessageType {
-  SYNC_PING = 0,
+  SYNC_PING = 100,
   SYNC_PING_REPLY,
   SYNC_CLIENT_REQUEST,
   SYNC_CLIENT_REQUEST_REPLY,

source/libs/sync/src/syncIO.c

@@ -41,8 +41,11 @@ static void    syncIOTickPingFunc(void *param, void *tmrId);
 
 // public function ------------
 int32_t syncIOSendMsg(void *clientRpc, const SEpSet *pEpSet, SRpcMsg *pMsg) {
-  sTrace("<--- syncIOSendMsg ---> clientRpc:%p, numOfEps:%d, inUse:%d, destAddr:%s-%u", clientRpc, pEpSet->numOfEps,
-         pEpSet->inUse, pEpSet->eps[0].fqdn, pEpSet->eps[0].port);
+  sTrace(
+      "<--- syncIOSendMsg ---> clientRpc:%p, numOfEps:%d, inUse:%d, destAddr:%s-%u, pMsg->ahandle:%p, pMsg->handle:%p, "
+      "pMsg->msgType:%d, pMsg->contLen:%d",
+      clientRpc, pEpSet->numOfEps, pEpSet->inUse, pEpSet->eps[0].fqdn, pEpSet->eps[0].port, pMsg->ahandle, pMsg->handle,
+      pMsg->msgType, pMsg->contLen);
   pMsg->handle = NULL;
   rpcSendRequest(clientRpc, pEpSet, pMsg, NULL);
   return 0;

source/libs/sync/src/syncMain.c

@@ -168,8 +168,19 @@ int32_t syncNodeStopPingTimer(SSyncNode* pSyncNode) {
 static int32_t syncNodePing(SSyncNode* pSyncNode, const SRaftId* destRaftId, SyncPing* pMsg) {
   sTrace("syncNodePing pSyncNode:%p ", pSyncNode);
   int32_t ret = 0;
+
   SRpcMsg rpcMsg;
   syncPing2RpcMsg(pMsg, &rpcMsg);
+
+  /*
+    SRpcMsg rpcMsg;
+    rpcMsg.contLen = 64;
+    rpcMsg.pCont = rpcMallocCont(rpcMsg.contLen);
+    snprintf((char*)rpcMsg.pCont, rpcMsg.contLen, "%s", "xxxxxxxxxxxxxx");
+    rpcMsg.handle = NULL;
+    rpcMsg.msgType = 1;
+  */
+
   syncNodeSendMsgById(destRaftId, pSyncNode, &rpcMsg);
 
   {
@@ -219,6 +230,7 @@ static int32_t syncNodeSendMsgByInfo(const SNodeInfo* nodeInfo, SSyncNode* pSync
 
 static int32_t syncNodeOnPingCb(SSyncNode* ths, SyncPing* pMsg) {
   int32_t ret = 0;
+  sTrace("syncNodeOnPingCb ---- =========");
   return ret;
 }
 

source/libs/sync/src/syncMessage.c

@@ -47,6 +47,7 @@ void syncPingDeserialize(const char* buf, uint32_t len, SyncPing* pMsg) {
 }
 
 void syncPing2RpcMsg(const SyncPing* pMsg, SRpcMsg* pRpcMsg) {
+  memset(pRpcMsg, 0, sizeof(*pRpcMsg));
   pRpcMsg->msgType = pMsg->msgType;
   pRpcMsg->contLen = pMsg->bytes;
   pRpcMsg->pCont = rpcMallocCont(pRpcMsg->contLen);

source/libs/sync/test/syncIOSendMsgClientTest.cpp

@@ -28,7 +28,7 @@ int main() {
   for (int i = 0; i < 10; ++i) {
     SEpSet epSet;
     epSet.inUse = 0;
-    epSet.numOfEps = 1;
+    epSet.numOfEps = 0;
     addEpIntoEpSet(&epSet, "127.0.0.1", 7030);
 
     SRpcMsg rpcMsg;

source/libs/sync/test/syncIOSendMsgTest.cpp

@@ -28,7 +28,7 @@ int main() {
   for (int i = 0; i < 10; ++i) {
     SEpSet epSet;
     epSet.inUse = 0;
-    epSet.numOfEps = 1;
+    epSet.numOfEps = 0;
     addEpIntoEpSet(&epSet, "127.0.0.1", 7010);
 
     SRpcMsg rpcMsg;

source/libs/sync/test/syncPingTest.cpp

@@ -67,6 +67,7 @@ int main() {
   assert(ret == 0);
 
   SSyncNode* pSyncNode = doSync();
+  gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing;
 
   ret = syncNodeStartPingTimer(pSyncNode);
   assert(ret == 0);