From e2cbf7cbb63a254e719ea5ac32bb659d896c5201 Mon Sep 17 00:00:00 2001
From: huangshiyi <3045712342@qq.com>
Date: Thu, 28 Jul 2022 17:20:40 +0800
Subject: [PATCH] fix
 [14125](https://github.com/taosdata/TDengine/issues/14125)

---
 src/inc/tsync.h         |  2 +-
 src/sync/src/syncMain.c | 55 +++++++++++++++++++++++++++++++----------
 2 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/src/inc/tsync.h b/src/inc/tsync.h
index d1b68e3f5a..34c5f29b57 100644
--- a/src/inc/tsync.h
+++ b/src/inc/tsync.h
@@ -41,7 +41,7 @@ typedef enum {
 typedef struct {
   uint32_t  nodeId;    // node ID assigned by TDengine
   uint16_t  nodePort;  // node sync Port
-  char      nodeFqdn[TSDB_FQDN_LEN]; // node FQDN  
+  char      nodeFqdn[TSDB_FQDN_LEN * 2]; // node FQDN
 } SNodeInfo;
 
 typedef struct {
diff --git a/src/sync/src/syncMain.c b/src/sync/src/syncMain.c
index 3f5b2e12e2..4dc29167a1 100644
--- a/src/sync/src/syncMain.c
+++ b/src/sync/src/syncMain.c
@@ -418,8 +418,12 @@ void syncRecover(int64_t rid) {
   nodeRole = TAOS_SYNC_ROLE_UNSYNCED;
   (*pNode->notifyRoleFp)(pNode->vgId, nodeRole);
 
-  pthread_mutex_lock(&pNode->mutex);
-
+//  pthread_mutex_lock(&pNode->mutex);
+  int err = pthread_mutex_trylock(&pNode->mutex);
+  if(EBUSY == err)
+  {
+    sDebug("pthread_mutex_trylock failed!");
+  }
   nodeVersion = 0;
 
   for (int32_t i = 0; i < pNode->replica; ++i) {
@@ -431,7 +435,7 @@ void syncRecover(int64_t rid) {
     }
   }
 
-  pthread_mutex_unlock(&pNode->mutex);
+  if(0 == err) pthread_mutex_unlock(&pNode->mutex);
 
   syncReleaseNode(pNode);
 }
@@ -930,12 +934,17 @@ static void syncNotStarted(void *param, void *tmrId) {
 
   SSyncNode *pNode = pPeer->pSyncNode;
 
-  pthread_mutex_lock(&pNode->mutex);
+//  pthread_mutex_lock(&pNode->mutex);
+  int err = pthread_mutex_trylock(&pNode->mutex);
+  if(EBUSY == err)
+  {
+    sDebug("pthread_mutex_trylock failed!");
+  }
   pPeer->timer = NULL;
   pPeer->sstatus = TAOS_SYNC_STATUS_INIT;
   sInfo("%s, sync conn is still not up, restart and set sstatus:%s", pPeer->id, syncStatus[pPeer->sstatus]);
   syncRestartConnection(pPeer);
-  pthread_mutex_unlock(&pNode->mutex);
+  if(0 == err) pthread_mutex_unlock(&pNode->mutex);
 
   syncReleasePeer(pPeer);
 }
@@ -1079,7 +1088,12 @@ static int32_t syncProcessPeerMsg(int64_t rid, void *buffer) {
   SSyncHead *pHead = buffer;
   SSyncNode *pNode = pPeer->pSyncNode;
   
-  pthread_mutex_lock(&pNode->mutex);
+//  pthread_mutex_lock(&pNode->mutex);
+  int err = pthread_mutex_trylock(&pNode->mutex);
+  if(EBUSY == err)
+  {
+    sDebug("pthread_mutex_trylock failed!");
+  }
 
   int32_t code = syncReadPeerMsg(pPeer, pHead);
 
@@ -1095,7 +1109,7 @@ static int32_t syncProcessPeerMsg(int64_t rid, void *buffer) {
     }
   }
 
-  pthread_mutex_unlock(&pNode->mutex);
+  if(0 == err) pthread_mutex_unlock(&pNode->mutex);
   syncReleasePeer(pPeer);
 
   return code;
@@ -1188,12 +1202,17 @@ static void syncCheckPeerConnection(void *param, void *tmrId) {
 
   SSyncNode *pNode = pPeer->pSyncNode;
 
-  pthread_mutex_lock(&pNode->mutex);
+//  pthread_mutex_lock(&pNode->mutex);
+  int err = pthread_mutex_trylock(&pNode->mutex);
+  if(EBUSY == err)
+  {
+    sDebug("pthread_mutex_trylock failed!");
+  }
 
   sDebug("%s, check peer connection", pPeer->id);
   syncSetupPeerConnection(pPeer);
 
-  pthread_mutex_unlock(&pNode->mutex);
+  if(0 == err) pthread_mutex_unlock(&pNode->mutex);
 
   syncReleasePeer(pPeer);
 }
@@ -1274,7 +1293,12 @@ static void syncProcessIncommingConnection(SOCKET connFd, uint32_t sourceIp) {
   sDebug("vgId:%d, sync connection is incoming, tranId:%u", vgId, msg.tranId);
 
   SSyncNode *pNode = *ppNode;
-  pthread_mutex_lock(&pNode->mutex);
+//  pthread_mutex_lock(&pNode->mutex);
+  int err = pthread_mutex_trylock(&pNode->mutex);
+  if(EBUSY == err)
+  {
+    sDebug("pthread_mutex_trylock failed!");
+  }
 
   SSyncPeer *pPeer;
   for (i = 0; i < pNode->replica; ++i) {
@@ -1305,7 +1329,7 @@ static void syncProcessIncommingConnection(SOCKET connFd, uint32_t sourceIp) {
     }
   }
 
-  pthread_mutex_unlock(&pNode->mutex);
+  if(0 == err) pthread_mutex_unlock(&pNode->mutex);
 }
 
 static void syncProcessBrokenLink(int64_t rid, int32_t closedByApp) {
@@ -1314,7 +1338,12 @@ static void syncProcessBrokenLink(int64_t rid, int32_t closedByApp) {
 
   SSyncNode *pNode = pPeer->pSyncNode;
 
-  pthread_mutex_lock(&pNode->mutex);
+//  pthread_mutex_lock(&pNode->mutex);
+  int err = pthread_mutex_trylock(&pNode->mutex);
+  if(EBUSY == err)
+  {
+    sDebug("pthread_mutex_trylock failed!");
+  }
 
   sDebug("%s, TCP link is broken since %s, pfd:%d sfd:%d closedByApp:%d",
          pPeer->id, strerror(errno), pPeer->peerFd, pPeer->syncFd, closedByApp);
@@ -1324,7 +1353,7 @@ static void syncProcessBrokenLink(int64_t rid, int32_t closedByApp) {
   }
 
   syncRestartConnection(pPeer);
-  pthread_mutex_unlock(&pNode->mutex);
+  if (0 == err) pthread_mutex_unlock(&pNode->mutex);
 
   syncReleasePeer(pPeer);
 }
-- 
GitLab