Merge pull request #5300 from taosdata/enhance/TD-3115

TD-3115

src/client/src/tscSystem.c

@@ -83,7 +83,7 @@ int32_t tscAcquireRpc(const char *key, const char *user, const char *secretEncry
   memset(&rpcInit, 0, sizeof(rpcInit));
   rpcInit.localPort = 0;
   rpcInit.label = "TSC";
-  rpcInit.numOfThreads = tscNumOfThreads * 2;    
+  rpcInit.numOfThreads = tscNumOfThreads;    
   rpcInit.cfp = tscProcessMsgFromServer;
   rpcInit.sessions = tsMaxConnections;
   rpcInit.connType = TAOS_CONN_CLIENT;
@@ -159,8 +159,6 @@ void taos_init_imp(void) {
   if (tscNumOfThreads < 2) {
     tscNumOfThreads = 2;
   }
-  taosTmrThreads = tscNumOfThreads;
-
   tscQhandle = taosInitScheduler(queueSize, tscNumOfThreads, "tsc");
   if (NULL == tscQhandle) {
     tscError("failed to init scheduler");

src/rpc/src/rpcMain.c

@@ -246,8 +246,12 @@ void *rpcOpen(const SRpcInit *pInit) {
 
   if(pInit->label) tstrncpy(pRpc->label, pInit->label, sizeof(pRpc->label));
   pRpc->connType = pInit->connType;
-  pRpc->idleTime = pInit->idleTime;
+  if (pRpc->connType == TAOS_CONN_CLIENT) {
+    pRpc->numOfThreads = pInit->numOfThreads;
+  } else {
     pRpc->numOfThreads = pInit->numOfThreads>TSDB_MAX_RPC_THREADS ? TSDB_MAX_RPC_THREADS:pInit->numOfThreads;
+  }
+  pRpc->idleTime = pInit->idleTime;
   pRpc->localPort = pInit->localPort;
   pRpc->afp = pInit->afp;
   pRpc->sessions = pInit->sessions+1;