From a5dabf7e9919851c861d3d9fa182de109733a884 Mon Sep 17 00:00:00 2001
From: Jeff Tao <jianhui.tao@qq.com>
Date: Sun, 12 Apr 2020 17:05:06 +0800
Subject: [PATCH] remove the potential race condition on TCP FD

---
 src/rpc/src/rpcServer.c | 47 ++++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/src/rpc/src/rpcServer.c b/src/rpc/src/rpcServer.c
index 6fe5385bba..7430157bcf 100644
--- a/src/rpc/src/rpcServer.c
+++ b/src/rpc/src/rpcServer.c
@@ -145,7 +145,7 @@ void *taosInitTcpServer(char *ip, uint16_t port, char *label, int numOfThreads,
 
 void taosCleanUpTcpServer(void *handle) {
   SThreadObj *pThreadObj;
-  SServerObj *pServerObj = (SServerObj *)handle;
+  SServerObj *pServerObj = handle;
 
   if (pServerObj == NULL) return;
 
@@ -174,15 +174,15 @@ void taosCleanUpTcpServer(void *handle) {
 }
 
 void taosCloseTcpServerConnection(void *chandle) {
-  SFdObj *pFdObj = (SFdObj *)chandle;
-
+  SFdObj *pFdObj = chandle;
   if (pFdObj == NULL) return;
 
+  pFdObj->thandle = NULL;
   taosCleanUpFdObj(pFdObj);
 }
 
 int taosSendTcpServerData(uint32_t ip, uint16_t port, void *data, int len, void *chandle) {
-  SFdObj *pFdObj = (SFdObj *)chandle;
+  SFdObj *pFdObj = chandle;
 
   if (chandle == NULL) return -1;
 
@@ -354,14 +354,25 @@ static void taosCleanUpFdObj(SFdObj *pFdObj) {
   if (pFdObj == NULL) return;
   if (pFdObj->signature != pFdObj) return;
 
+  pFdObj->signature = NULL;
   pThreadObj = pFdObj->pThreadObj;
-  if (pThreadObj == NULL) {
-    tError("FdObj double clean up!!!");
-    return;
-  }
 
-  epoll_ctl(pThreadObj->pollFd, EPOLL_CTL_DEL, pFdObj->fd, NULL);
+  // notify the upper layer, so it will clean the associated context
+  if (pFdObj->thandle) {
+    SRecvInfo recvInfo;
+    recvInfo.msg = NULL;
+    recvInfo.msgLen = 0;
+    recvInfo.ip = 0;
+    recvInfo.port = 0;
+    recvInfo.shandle = pThreadObj->shandle;
+    recvInfo.thandle = pFdObj->thandle;;
+    recvInfo.chandle = NULL;
+    recvInfo.connType = RPC_CONN_TCP;
+    (*(pThreadObj->processData))(&recvInfo);
+  } 
+
   close(pFdObj->fd);
+  epoll_ctl(pThreadObj->pollFd, EPOLL_CTL_DEL, pFdObj->fd, NULL);
 
   pthread_mutex_lock(&pThreadObj->threadMutex);
 
@@ -384,24 +395,8 @@ static void taosCleanUpFdObj(SFdObj *pFdObj) {
 
   pthread_mutex_unlock(&pThreadObj->threadMutex);
 
-  // notify the upper layer, so it will clean the associated context
-  SRecvInfo recvInfo;
-  recvInfo.msg = NULL;
-  recvInfo.msgLen = 0;
-  recvInfo.ip = 0;
-  recvInfo.port = 0;
-  recvInfo.shandle = pThreadObj->shandle;
-  recvInfo.thandle = pFdObj->thandle;;
-  recvInfo.chandle = NULL;
-  recvInfo.connType = RPC_CONN_TCP;
-
-  if (pFdObj->thandle) (*(pThreadObj->processData))(&recvInfo);
-
   tTrace("%s TCP thread:%d, FD:%p is cleaned up, numOfFds:%d", pThreadObj->label, pThreadObj->threadId,
-         pFdObj, pThreadObj->numOfFds);
-
-  memset(pFdObj, 0, sizeof(SFdObj));
-
+          pFdObj, pThreadObj->numOfFds);
   tfree(pFdObj);
 }
 
-- 
GitLab