未验证 提交 cc7ac44f 编写于 作者: Y Yiqing Liu 提交者: GitHub

Merge pull request #4636 from taosdata/revert-4627-feature/wal

Revert "TD-2480"
...@@ -420,12 +420,7 @@ void rpcSendResponse(const SRpcMsg *pRsp) { ...@@ -420,12 +420,7 @@ void rpcSendResponse(const SRpcMsg *pRsp) {
SRpcMsg *pMsg = &rpcMsg; SRpcMsg *pMsg = &rpcMsg;
SRpcInfo *pRpc = pConn->pRpc; SRpcInfo *pRpc = pConn->pRpc;
if (pConn == NULL) { if ( pMsg->pCont == NULL ) {
rpcFreeCont(pMsg->pCont);
return;
}
if (pMsg->pCont == NULL) {
pMsg->pCont = rpcMallocCont(0); pMsg->pCont = rpcMallocCont(0);
pMsg->contLen = 0; pMsg->contLen = 0;
} }
...@@ -1026,7 +1021,7 @@ static void rpcReportBrokenLinkToServer(SRpcConn *pConn) { ...@@ -1026,7 +1021,7 @@ static void rpcReportBrokenLinkToServer(SRpcConn *pConn) {
rpcMsg.pCont = pConn->pReqMsg; // pReqMsg is re-used to store the APP context from server rpcMsg.pCont = pConn->pReqMsg; // pReqMsg is re-used to store the APP context from server
rpcMsg.contLen = pConn->reqMsgLen; // reqMsgLen is re-used to store the APP context length rpcMsg.contLen = pConn->reqMsgLen; // reqMsgLen is re-used to store the APP context length
rpcMsg.ahandle = pConn->ahandle; rpcMsg.ahandle = pConn->ahandle;
rpcMsg.handle = NULL; rpcMsg.handle = pConn;
rpcMsg.msgType = pConn->inType; rpcMsg.msgType = pConn->inType;
rpcMsg.code = TSDB_CODE_RPC_NETWORK_UNAVAIL; rpcMsg.code = TSDB_CODE_RPC_NETWORK_UNAVAIL;
pConn->pReqMsg = NULL; pConn->pReqMsg = NULL;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册