fix(stream): fix deadlock caused during merging branch.
This commit is contained in:
parent
375d0abea5
commit
ed22dd5f26
|
@ -386,16 +386,6 @@ int32_t doScanWalForAllTasks(SStreamMeta* pStreamMeta, bool* pScanIdle) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
taosThreadMutexLock(&pTask->lock);
|
|
||||||
pStatus = streamGetTaskStatusStr(pTask->status.taskStatus);
|
|
||||||
|
|
||||||
if (pTask->status.taskStatus != TASK_STATUS__NORMAL) {
|
|
||||||
tqDebug("s-task:%s not ready for submit block from wal, status:%s", pTask->id.idStr, pStatus);
|
|
||||||
taosThreadMutexUnlock(&pTask->lock);
|
|
||||||
streamMetaReleaseTask(pStreamMeta, pTask);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pItem != NULL) {
|
if (pItem != NULL) {
|
||||||
noDataInWal = false;
|
noDataInWal = false;
|
||||||
code = streamTaskPutDataIntoInputQ(pTask, pItem);
|
code = streamTaskPutDataIntoInputQ(pTask, pItem);
|
||||||
|
|
Loading…
Reference in New Issue