Merge branch '3.0' into enh/opt-transport
This commit is contained in:
parent
ef0c301a6a
commit
ff1ac62183
|
@ -1615,7 +1615,7 @@ int32_t cliMayGetStateByQid(SCliThrd* pThrd, SCliReq* pReq, SCliConn** pConn) {
|
||||||
} else {
|
} else {
|
||||||
SExHandle* exh = transAcquireExHandle(transGetRefMgt(), qid);
|
SExHandle* exh = transAcquireExHandle(transGetRefMgt(), qid);
|
||||||
if (exh == NULL) {
|
if (exh == NULL) {
|
||||||
return TSDB_CODE_RPC_NO_STATE;
|
return TSDB_CODE_RPC_STATE_DROPED;
|
||||||
}
|
}
|
||||||
|
|
||||||
SReqState* pState = taosHashGet(pThrd->pIdConnTable, &qid, sizeof(qid));
|
SReqState* pState = taosHashGet(pThrd->pIdConnTable, &qid, sizeof(qid));
|
||||||
|
@ -1667,9 +1667,7 @@ void cliHandleBatchReq(SCliThrd* pThrd, SCliReq* pReq) {
|
||||||
if (code == 0) {
|
if (code == 0) {
|
||||||
(void)cliHandleState_mayUpdateStateCtx(pConn, pReq);
|
(void)cliHandleState_mayUpdateStateCtx(pConn, pReq);
|
||||||
} else if (code == TSDB_CODE_RPC_STATE_DROPED) {
|
} else if (code == TSDB_CODE_RPC_STATE_DROPED) {
|
||||||
STraceId* trace = &pReq->msg.info.traceId;
|
TAOS_CHECK_GOTO(code, &lino, _exception);
|
||||||
tWarn("%s failed to get statue, qid:%" PRId64 "", pInst->label, pReq->msg.info.qId);
|
|
||||||
destroyReq(pReq);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue