xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

TD-2165

This commit is contained in:
Shengliang Guan 2020-12-05 06:16:46 +00:00
parent 8b8c79487a
commit 6d28d01b40
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/vnode/inc/vnodeCancel.h
View File

@ -24,7 +24,7 @@ extern "C" {
int32_t vnodeInitCWorker();
void vnodeCleanupCWorker();
int32_t vnodeWriteIntoCQueue(SVReadMsg *pRead);
int32_t vnodeWriteIntoCQueue(SVnodeObj *pVnode, SVReadMsg *pRead);
#ifdef __cplusplus
}

25
src/vnode/src/vnodeCancel.c
View File

@ -120,17 +120,21 @@ void vnodeCleanupCWorker() {
vnodeStopCWorker();
}
int32_t vnodeWriteIntoCQueue(SVReadMsg *pRead) {
vTrace("msg:%p, write into vcqueue", pRead);
int32_t vnodeWriteIntoCQueue(SVnodeObj *pVnode, SVReadMsg *pRead) {
atomic_add_fetch_32(&pVnode->refCount, 1);
pRead->pVnode = pVnode;
vTrace("vgId:%d, write into vcqueue, refCount:%d queued:%d", pVnode->vgId, pVnode->refCount, pVnode->queuedRMsg);
return taosWriteQitem(tsVCWorkerQueue, pRead->qtype, pRead);
}
static void vnodeFreeFromCQueue(SVReadMsg *pRead) {
vTrace("msg:%p, free from vcqueue", pRead);
static void vnodeFreeFromCQueue(SVnodeObj *pVnode, SVReadMsg *pRead) {
vTrace("vgId:%d, free from vcqueue, refCount:%d queued:%d", pVnode->vgId, pVnode->refCount, pVnode->queuedRMsg);
taosFreeQitem(pRead);
vnodeRelease(pVnode);
}
static void vnodeSendVCancelRpcRsp(SVReadMsg *pRead, int32_t code) {
static void vnodeSendVCancelRpcRsp(SVnodeObj *pVnode, SVReadMsg *pRead, int32_t code) {
SRpcMsg rpcRsp = {
.handle = pRead->rpcHandle,
.pCont = pRead->rspRet.rsp,
@ -139,7 +143,7 @@ static void vnodeSendVCancelRpcRsp(SVReadMsg *pRead, int32_t code) {
};
rpcSendResponse(&rpcRsp);
vnodeFreeFromCQueue(pRead);
vnodeFreeFromCQueue(pVnode, pRead);
}
static void *vnodeCWorkerFunc(void *param) {
@ -153,13 +157,12 @@ static void *vnodeCWorkerFunc(void *param) {
break;
}
vTrace("msg:%p will be processed in vcworker queue", pRead);
assert(qtype == TAOS_QTYPE_RPC);
assert(pVnode == NULL);
int32_t code = vnodeProcessRead(NULL, pRead);
vnodeSendVCancelRpcRsp(pRead, code);
assert(pRead->pVnode != NULL);
int32_t code = vnodeProcessRead(pRead->pVnode, pRead);
vnodeSendVCancelRpcRsp(pRead->pVnode, pRead, code);
}
return NULL;

4
src/vnode/src/vnodeRead.c
View File

@ -116,9 +116,9 @@ int32_t vnodeWriteToRQueue(void *vparam, void *pCont, int32_t contLen, int8_t qt
}
pRead->qtype = qtype;
if (pRead->msgType == TSDB_MSG_TYPE_CM_KILL_QUERY) {
return vnodeWriteIntoCQueue(pRead);
return vnodeWriteIntoCQueue(pVnode, pRead);
} else {
atomic_add_fetch_32(&pVnode->refCount, 1);
atomic_add_fetch_32(&pVnode->queuedRMsg, 1);