From a82bdb8b55fe63faea3d1d361fe50c843b72ac8c Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Wed, 15 Jul 2020 19:28:56 +0800 Subject: [PATCH] [TD-931] wrong pass word may cause deadock --- src/client/src/tscServer.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c index 0732863793..d8af6d5c87 100644 --- a/src/client/src/tscServer.c +++ b/src/client/src/tscServer.c @@ -246,25 +246,25 @@ void tscProcessMsgFromServer(SRpcMsg *rpcMsg, SRpcIpSet *pIpSet) { rpcMsg->code = TSDB_CODE_RPC_NETWORK_UNAVAIL; } else { STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0); - if (rpcMsg->code != TSDB_CODE_SUCCESS) { - if (pCmd->command == TSDB_SQL_CONNECT) { - rpcMsg->code = TSDB_CODE_RPC_NETWORK_UNAVAIL; - rpcFreeCont(rpcMsg->pCont); - return; - } - - if (pCmd->command == TSDB_SQL_HB) { - rpcMsg->code = TSDB_CODE_RPC_NOT_READY; - rpcFreeCont(rpcMsg->pCont); - return; - } - - if (pCmd->command == TSDB_SQL_META || pCmd->command == TSDB_SQL_DESCRIBE_TABLE || - pCmd->command == TSDB_SQL_STABLEVGROUP || pCmd->command == TSDB_SQL_SHOW || - pCmd->command == TSDB_SQL_RETRIEVE) { - // get table meta/vgroup query will not retry, do nothing - } - } + // if (rpcMsg->code != TSDB_CODE_RPC_NETWORK_UNAVAIL) { + // if (pCmd->command == TSDB_SQL_CONNECT) { + // rpcMsg->code = TSDB_CODE_RPC_NETWORK_UNAVAIL; + // rpcFreeCont(rpcMsg->pCont); + // return; + // } + + // if (pCmd->command == TSDB_SQL_HB) { + // rpcMsg->code = TSDB_CODE_RPC_NOT_READY; + // rpcFreeCont(rpcMsg->pCont); + // return; + // } + + // if (pCmd->command == TSDB_SQL_META || pCmd->command == TSDB_SQL_DESCRIBE_TABLE || + // pCmd->command == TSDB_SQL_STABLEVGROUP || pCmd->command == TSDB_SQL_SHOW || + // pCmd->command == TSDB_SQL_RETRIEVE) { + // // get table meta/vgroup query will not retry, do nothing + // } + // } if ((pCmd->command == TSDB_SQL_SELECT || pCmd->command == TSDB_SQL_FETCH || pCmd->command == TSDB_SQL_INSERT || pCmd->command == TSDB_SQL_UPDATE_TAGS_VAL) && -- GitLab