From 5bce8278b1bfaf6c78dfc5d225e504eef8872e9c Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Fri, 29 Jan 2021 14:53:03 +0800
Subject: [PATCH 1/4] [TD-2493]<test>exclude md,connector,Jenkinsfile

---
 Jenkinsfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index 516b179dce..335ab5773a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -45,6 +45,7 @@ def pre_test(){
     git pull
     git fetch origin +refs/pull/${CHANGE_ID}/merge
     git checkout -qf FETCH_HEAD
+    git --no-pager diff --name-only FETCH_HEAD $(git merge-base FETCH_HEAD develop)|grep -v -E '.*md|//src//connector|Jenkinsfile' || exit(0)
     cd ${WK}
     git reset --hard HEAD~10
     git checkout develop

From a9d233ec7c50fe942dfe7881ae5a37570a7ec122 Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Fri, 29 Jan 2021 14:59:08 +0800
Subject: [PATCH 2/4] test

---
 Jenkinsfile                         | 2 +-
 tests/pytest/alter/alter_replica.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 335ab5773a..2ed90b2ade 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -45,7 +45,7 @@ def pre_test(){
     git pull
     git fetch origin +refs/pull/${CHANGE_ID}/merge
     git checkout -qf FETCH_HEAD
-    git --no-pager diff --name-only FETCH_HEAD $(git merge-base FETCH_HEAD develop)|grep -v -E '.*md|//src//connector|Jenkinsfile' || exit(0)
+    git --no-pager diff --name-only FETCH_HEAD $(git merge-base FETCH_HEAD develop)|grep -v -E '.*md|//src//connector|Jenkinsfile' || exit 0
     cd ${WK}
     git reset --hard HEAD~10
     git checkout develop
diff --git a/tests/pytest/alter/alter_replica.py b/tests/pytest/alter/alter_replica.py
index 6cf0f65825..153940a6f5 100644
--- a/tests/pytest/alter/alter_replica.py
+++ b/tests/pytest/alter/alter_replica.py
@@ -6,7 +6,7 @@
 #  No part of this file may be reproduced, stored, transmitted,
 #  disclosed or used in any form or by any means other than as
 #  expressly provided by the written permission from Jianhui Tao
-#
+#  
 ###################################################################
 
 # -*- coding: utf-8 -*-

From bb7c5da55df992246393a3f3e468fa1fe920e242 Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Fri, 29 Jan 2021 15:02:40 +0800
Subject: [PATCH 3/4] revert

---
 tests/pytest/alter/alter_replica.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/pytest/alter/alter_replica.py b/tests/pytest/alter/alter_replica.py
index 153940a6f5..6cf0f65825 100644
--- a/tests/pytest/alter/alter_replica.py
+++ b/tests/pytest/alter/alter_replica.py
@@ -6,7 +6,7 @@
 #  No part of this file may be reproduced, stored, transmitted,
 #  disclosed or used in any form or by any means other than as
 #  expressly provided by the written permission from Jianhui Tao
-#  
+#
 ###################################################################
 
 # -*- coding: utf-8 -*-

From b6a733ee8abd5d4a3a801f59e541e6dc8d3342e6 Mon Sep 17 00:00:00 2001
From: yihaoDeng <yhdeng@taosdata.com>
Date: Sat, 30 Jan 2021 16:29:00 +0000
Subject: [PATCH 4/4] TD-2884

---
 src/client/src/tscSystem.c | 8 +++++---
 src/rpc/src/rpcTcp.c       | 7 ++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/client/src/tscSystem.c b/src/client/src/tscSystem.c
index fe1c45bd39..62ae2cd709 100644
--- a/src/client/src/tscSystem.c
+++ b/src/client/src/tscSystem.c
@@ -65,7 +65,7 @@ void tscReleaseRpc(void *param)  {
     return;
   }
   pthread_mutex_lock(&rpcObjMutex);
-  taosCacheRelease(tscRpcCache, (void *)&param, false); 
+  taosCacheRelease(tscRpcCache, (void *)&param, true); 
   pthread_mutex_unlock(&rpcObjMutex);
 } 
 
@@ -216,7 +216,6 @@ void taos_cleanup(void) {
   taosCloseRef(id);
 
   taosCleanupKeywordsTable();
-  taosCloseLog();
 
   p = tscRpcCache; 
   tscRpcCache = NULL;
@@ -226,7 +225,10 @@ void taos_cleanup(void) {
     pthread_mutex_destroy(&rpcObjMutex);
   }
 
-  if (tscEmbedded == 0) rpcCleanup();
+  if (tscEmbedded == 0) {
+    rpcCleanup();
+    taosCloseLog();
+  };
 
   p = tscTmr;
   tscTmr = NULL;
diff --git a/src/rpc/src/rpcTcp.c b/src/rpc/src/rpcTcp.c
index 111b722f76..3295c130dd 100644
--- a/src/rpc/src/rpcTcp.c
+++ b/src/rpc/src/rpcTcp.c
@@ -364,10 +364,11 @@ void *taosInitTcpClient(uint32_t ip, uint16_t port, char *label, int numOfThread
 }
 
 void taosStopTcpClient(void *chandle) {
-  SThreadObj *pThreadObj = chandle;
-  if (pThreadObj == NULL) return;
+  SClientObj *pClientObj = chandle;
 
-  tDebug ("%s TCP client is stopped", pThreadObj->label);
+  if (pClientObj == NULL) return;
+
+  tDebug ("%s TCP client is stopped", pClientObj->label);
 }
 
 void taosCleanUpTcpClient(void *chandle) {