From 2ecc202cb331911c03d28ed1a687e2aac5cbc5cd Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Wed, 24 Jan 2024 17:10:45 +0800 Subject: [PATCH] fix(stream): remove invalid assert. --- source/libs/stream/src/streamExec.c | 7 ++----- source/libs/stream/src/streamTaskSm.c | 4 +++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/source/libs/stream/src/streamExec.c b/source/libs/stream/src/streamExec.c index 5cff4b318f..eb5ce87b1c 100644 --- a/source/libs/stream/src/streamExec.c +++ b/source/libs/stream/src/streamExec.c @@ -402,13 +402,10 @@ int32_t streamDoTransferStateToStreamTask(SStreamTask* pTask) { streamTaskSendCheckpointReq(pStreamTask); // streamTaskResume(pStreamTask); - // 4. free it and remove fill-history task from disk meta-store -// streamBuildAndSendDropTaskMsg(pTask->pMsgCb, pMeta->vgId, &pTask->id); - - // 5. assign the status to the value that will be kept in disk + // 4. assign the status to the value that will be kept in disk pStreamTask->status.taskStatus = streamTaskGetStatus(pStreamTask)->state; - // 6. open the inputQ for all upstream tasks + // 5. open the inputQ for all upstream tasks streamTaskOpenAllUpstreamInput(pStreamTask); streamMetaReleaseTask(pMeta, pStreamTask); diff --git a/source/libs/stream/src/streamTaskSm.c b/source/libs/stream/src/streamTaskSm.c index 3f0b8c93ba..1671d78ed2 100644 --- a/source/libs/stream/src/streamTaskSm.c +++ b/source/libs/stream/src/streamTaskSm.c @@ -98,7 +98,9 @@ int32_t streamTaskSendTransSuccessMsg(SStreamTask* pTask) { } int32_t streamTaskKeepCurrentVerInWal(SStreamTask* pTask) { - ASSERT(HAS_RELATED_FILLHISTORY_TASK(pTask)); + if (!HAS_RELATED_FILLHISTORY_TASK(pTask)) { + stError("s-task:%s no related fill-history task, since it may have been dropped already", pTask->id.idStr); + } if (pTask->info.taskLevel == TASK_LEVEL__SOURCE) { pTask->hTaskInfo.haltVer = walReaderGetCurrentVer(pTask->exec.pWalReader);