From 955b89f3cb0b90a36a4baee8f27b465b1d4a8159 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Thu, 24 Feb 2022 18:16:22 +0800
Subject: [PATCH] rpc config

---
 include/libs/transport/trpc.h       |  8 +-------
 source/client/src/clientEnv.c       |  6 +-----
 source/dnode/mgmt/impl/src/dndEnv.c |  3 +--
 source/libs/transport/src/rpcMain.c | 10 +---------
 source/libs/transport/src/trans.c   |  2 +-
 5 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/include/libs/transport/trpc.h b/include/libs/transport/trpc.h
index befd309582..5e3860822e 100644
--- a/include/libs/transport/trpc.h
+++ b/include/libs/transport/trpc.h
@@ -84,13 +84,7 @@ typedef struct SRpcInit {
   void *parent;
 } SRpcInit;
 
-typedef struct {
-  int32_t rpcTimer;
-  int32_t rpcMaxTime;
-  int32_t sver;
-} SRpcCfg;
-
-int32_t rpcInit(SRpcCfg *pCfg);
+int32_t rpcInit();
 void    rpcCleanup();
 void   *rpcOpen(const SRpcInit *pRpc);
 void    rpcClose(void *);
diff --git a/source/client/src/clientEnv.c b/source/client/src/clientEnv.c
index f07048efbc..c8b0785a3a 100644
--- a/source/client/src/clientEnv.c
+++ b/source/client/src/clientEnv.c
@@ -225,11 +225,7 @@ void taos_init_imp(void) {
   initMsgHandleFp();
   initQueryModuleMsgHandle();
 
-  SRpcCfg rpcCfg = {0};
-  rpcCfg.rpcTimer = cfgGetItem(tscCfg, "rpcTimer")->i32;
-  rpcCfg.rpcMaxTime = cfgGetItem(tscCfg, "rpcMaxTime")->i32;
-  rpcCfg.sver = 30000000;
-  rpcInit(&rpcCfg);
+  rpcInit();
 
   SCatalogCfg cfg = {.maxDBCacheNum = 100, .maxTblCacheNum = 100};
   catalogInit(&cfg);
diff --git a/source/dnode/mgmt/impl/src/dndEnv.c b/source/dnode/mgmt/impl/src/dndEnv.c
index 7c45474be4..510ffbfdbf 100644
--- a/source/dnode/mgmt/impl/src/dndEnv.c
+++ b/source/dnode/mgmt/impl/src/dndEnv.c
@@ -270,8 +270,7 @@ int32_t dndInit(const SDnodeEnvCfg *pCfg) {
   taosBlockSIGPIPE();
   taosResolveCRC();
 
-  SRpcCfg rpcCfg = {.rpcTimer = pCfg->rpcTimer, .rpcMaxTime = pCfg->rpcMaxTime, .sver = pCfg->sver};
-  if (rpcInit(&rpcCfg) != 0) {
+  if (rpcInit() != 0) {
     dError("failed to init rpc since %s", terrstr());
     dndCleanup();
     return -1;
diff --git a/source/libs/transport/src/rpcMain.c b/source/libs/transport/src/rpcMain.c
index cfd01bf3be..e1319da162 100644
--- a/source/libs/transport/src/rpcMain.c
+++ b/source/libs/transport/src/rpcMain.c
@@ -42,8 +42,6 @@ int tsRpcMaxRetry;
 int tsRpcHeadSize;
 int tsRpcOverhead;
 
-int32_t tsRpcForceTcp = 1;   // disable this, means query, show command use udp protocol as default
-
 SHashObj *tsFqdnHash;
 
 #ifndef USE_UV
@@ -146,10 +144,6 @@ typedef struct SRpcConn {
 static int     tsRpcRefId = -1;
 static int32_t tsRpcNum = 0;
 
-int32_t  tsRpcTimer = 300;
-int32_t  tsRpcMaxTime = 600;  // seconds;
-uint32_t tsVersion = 0;
-
 // static pthread_once_t tsRpcInit = PTHREAD_ONCE_INIT;
 
 // server:0 client:1  tcp:2 udp:0
@@ -229,9 +223,7 @@ static void rpcInitImp(void) {
   tsFqdnHash = taosHashInit(64, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), false, HASH_ENTRY_LOCK);
 }
 
-int32_t rpcInit(SRpcCfg *pCfg) {
-  tsRpcTimer = pCfg->rpcTimer;
-  tsRpcMaxTime = pCfg->rpcMaxTime;
+int32_t rpcInit() {
   pthread_once(&tsRpcInitOnce, rpcInitImp);
   return 0;
 }
diff --git a/source/libs/transport/src/trans.c b/source/libs/transport/src/trans.c
index 09aee6c8bc..b45683617f 100644
--- a/source/libs/transport/src/trans.c
+++ b/source/libs/transport/src/trans.c
@@ -112,7 +112,7 @@ void rpcSendRedirectRsp(void* thandle, const SEpSet* pEpSet) {
 int  rpcReportProgress(void* pConn, char* pCont, int contLen) { return -1; }
 void rpcCancelRequest(int64_t rid) { return; }
 
-int32_t rpcInit(SRpcCfg* pCfg) {
+int32_t rpcInit() {
   // impl later
   return 0;
 }
-- 
GitLab