TD-1617

src/sync/inc/syncInt.h

@@ -118,7 +118,7 @@ typedef struct SsyncPeer {
   uint32_t ip;
   uint16_t port;
   char     fqdn[TSDB_FQDN_LEN];   // peer ip string
-  char        id[TSDB_EP_LEN+16];   // peer vgId + end point
+  char     id[TSDB_EP_LEN + 32];  // peer vgId + end point
   int8_t   role;
   int8_t   sstatus;   // sync status
   uint64_t version;
@@ -127,11 +127,11 @@ typedef struct SsyncPeer {
   int      peerFd;          // forward FD
   int      numOfRetrieves;  // number of retrieves tried
   int      fileChanged;     // a flag to indicate file is changed during retrieving process
-  void       *timer;
-  void       *pConn;
+  void *   timer;
+  void *   pConn;
   int      notifyFd;
   int      watchNum;
-  int        *watchFd;
+  int *    watchFd;
   int8_t   refCount;  // reference count
   struct   SSyncNode *pSyncNode;
 } SSyncPeer;

src/sync/src/syncMain.c

@@ -671,7 +671,6 @@ static void syncCheckRole(SSyncPeer *pPeer, SPeerStatus peersStatus[], int8_t ne
   int8_t     selfOldRole = nodeRole;
   int8_t     i, syncRequired = 0;
 
-  pNode->peerInfo[pNode->selfIndex]->version = nodeVersion;
   pPeer->role = newRole;
 
   sDebug("%s, own role:%s, new peer role:%s", pPeer->id, syncRole[nodeRole], syncRole[pPeer->role]);
@@ -923,7 +922,7 @@ static int syncReadPeerMsg(SSyncPeer *pPeer, SSyncHead *pHead, char *cont) {
 static int syncProcessPeerMsg(void *param, void *buffer) {
   SSyncPeer *pPeer = param;
   SSyncHead  head;
-  char *     cont = (char *)buffer;
+  char *     cont = buffer;
 
   SSyncNode *pNode = pPeer->pSyncNode;
   pthread_mutex_lock(&(pNode->mutex));

src/sync/src/tarbitrator.c

@@ -35,7 +35,7 @@ static tsem_t   tsArbSem;
 static ttpool_h tsArbTcpPool;
 
 typedef struct {
-  char  id[TSDB_EP_LEN+24];
+  char  id[TSDB_EP_LEN + 24];
   int   nodeFd;
   void *pConn;
 } SNodeConn;
@@ -43,12 +43,12 @@ typedef struct {
 int main(int argc, char *argv[]) {
   char arbLogPath[TSDB_FILENAME_LEN + 16] = {0};
 
-  for (int i=1; i<argc; ++i) {
-    if (strcmp(argv[i], "-p")==0 && i < argc-1) {
+  for (int i = 1; i < argc; ++i) {
+    if (strcmp(argv[i], "-p") == 0 && i < argc - 1) {
       tsArbitratorPort = atoi(argv[++i]);
-    } else if (strcmp(argv[i], "-d")==0 && i < argc-1) {
+    } else if (strcmp(argv[i], "-d") == 0 && i < argc - 1) {
       debugFlag = atoi(argv[++i]);
-    } else if (strcmp(argv[i], "-g")==0 && i < argc-1) {
+    } else if (strcmp(argv[i], "-g") == 0 && i < argc - 1) {
       if (strlen(argv[++i]) > TSDB_FILENAME_LEN) continue;
       tstrncpy(arbLogPath, argv[i], sizeof(arbLogPath));
     } else {
@@ -108,8 +108,7 @@ int main(int argc, char *argv[]) {
   return 0;
 }
 
-static void arbProcessIncommingConnection(int connFd, uint32_t sourceIp)
-{
+static void arbProcessIncommingConnection(int connFd, uint32_t sourceIp) {
   char ipstr[24];
   tinet_ntoa(ipstr, sourceIp);
   sDebug("peer TCP connection from ip:%s", ipstr);
@@ -121,13 +120,14 @@ static void arbProcessIncommingConnection(int connFd, uint32_t sourceIp)
     return;
   }
 
-  SNodeConn *pNode = (SNodeConn *) calloc(sizeof(SNodeConn), 1);
+  SNodeConn *pNode = (SNodeConn *)calloc(sizeof(SNodeConn), 1);
   if (pNode == NULL) {
     sError("failed to allocate memory(%s)", strerror(errno));
     taosCloseSocket(connFd);
     return;
   }
 
+  firstPkt.fqdn[sizeof(firstPkt.fqdn) - 1] = 0;
   snprintf(pNode->id, sizeof(pNode->id), "vgId:%d peer:%s:%d", firstPkt.sourceId, firstPkt.fqdn, firstPkt.port);
   if (firstPkt.syncHead.vgId) {
     sDebug("%s, vgId in head is not zero, close the connection", pNode->id);
@@ -151,10 +151,10 @@ static void arbProcessBrokenLink(void *param) {
 }
 
 static int arbProcessPeerMsg(void *param, void *buffer) {
-  SNodeConn * pNode = param;
+  SNodeConn *pNode = param;
   SSyncHead  head;
   int        bytes = 0;
-  char       *cont = (char *)buffer;
+  char *     cont = (char *)buffer;
 
   int hlen = taosReadMsg(pNode->nodeFd, &head, sizeof(head));
   if (hlen != sizeof(head)) {