Merge branch 'feature/2.0tsdb' of https://github.com/taosdata/TDengine into feature/2.0tsdb

src/vnode/src/vnodeRead.c

@@ -110,7 +110,8 @@ static int32_t vnodeProcessQueryMsg(SVnodeObj *pVnode, SReadMsg *pReadMsg) {
     pRet->rsp = pRsp;
 
     // current connect is broken
-    if (vnodeNotifyCurrentQhandle(pReadMsg->rpcMsg.handle, pQInfo, pVnode->vgId) != TSDB_CODE_SUCCESS) {
+    if ((code == TSDB_CODE_SUCCESS) &&
+        (vnodeNotifyCurrentQhandle(pReadMsg->rpcMsg.handle, pQInfo, pVnode->vgId) != TSDB_CODE_SUCCESS)) {
       vError("vgId:%d, QInfo:%p, dnode query discarded since link is broken, %p", pVnode->vgId, pQInfo, pReadMsg->rpcMsg.handle);
       pRsp->code = TSDB_CODE_RPC_NETWORK_UNAVAIL;