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

fix(stream): fix deadlock caused by streamTaskHalt function.

This commit is contained in:
Haojun Liao 2023-09-20 14:49:09 +08:00
parent dff4bd3c8d
commit a997fa5552
1 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
source/dnode/vnode/src/tq/tq.c
View File

@ -1126,12 +1126,45 @@ int32_t tqProcessTaskScanHistory(STQ* pTq, SRpcMsg* pMsg) {
// now we can stop the stream task execution // now we can stop the stream task execution
int64_t latestVer = 0; int64_t latestVer = 0;
taosThreadMutexLock(&pStreamTask->lock); while (1) {
streamTaskHalt(pStreamTask); taosThreadMutexLock(&pStreamTask->lock);
tqDebug("s-task:%s level:%d sched-status:%d is halt by fill-history task:%s", pStreamTask->id.idStr, int8_t status = pTask->status.taskStatus;
pStreamTask->info.taskLevel, pStreamTask->status.schedStatus, id); if (status == TASK_STATUS__DROPPING || status == TASK_STATUS__STOP) {
latestVer = walReaderGetCurrentVer(pStreamTask->exec.pWalReader); // return;
taosThreadMutexUnlock(&pStreamTask->lock); // do nothing
}
if (status == TASK_STATUS__HALT) {
// return;
// do nothing
}
if (pTask->status.taskStatus == TASK_STATUS__CK) {
qDebug("s-task:%s status:%s during generating checkpoint, wait for 1sec and retry set status:halt",
pTask->id.idStr, streamGetTaskStatusStr(TASK_STATUS__CK));
taosThreadMutexUnlock(&pStreamTask->lock);
taosMsleep(1000);
continue;
}
// upgrade to halt status
if (status == TASK_STATUS__PAUSE) {
qDebug("s-task:%s upgrade status to %s from %s", pTask->id.idStr, streamGetTaskStatusStr(TASK_STATUS__HALT),
streamGetTaskStatusStr(TASK_STATUS__PAUSE));
} else {
qDebug("s-task:%s halt task", pTask->id.idStr);
}
pTask->status.keepTaskStatus = status;
pTask->status.taskStatus = TASK_STATUS__HALT;
tqDebug("s-task:%s level:%d sched-status:%d is halt by fill-history task:%s", pStreamTask->id.idStr,
pStreamTask->info.taskLevel, pStreamTask->status.schedStatus, id);
latestVer = walReaderGetCurrentVer(pStreamTask->exec.pWalReader);
taosThreadMutexUnlock(&pStreamTask->lock);
break;
}
// if it's an source task, extract the last version in wal. // if it's an source task, extract the last version in wal.
pRange = &pTask->dataRange.range; pRange = &pTask->dataRange.range;