diff --git a/source/dnode/vnode/src/tq/tqStreamTaskSnap.c b/source/dnode/vnode/src/tq/tqStreamTaskSnap.c index 20d25dbceb..2f41a7c1bb 100644 --- a/source/dnode/vnode/src/tq/tqStreamTaskSnap.c +++ b/source/dnode/vnode/src/tq/tqStreamTaskSnap.c @@ -89,7 +89,6 @@ int32_t streamTaskSnapReaderClose(SStreamTaskReader* pReader) { taosArrayDestroy(pReader->tdbTbList); tdbTbcClose(pReader->pCur); taosMemoryFree(pReader); - return code; } diff --git a/source/dnode/vnode/src/vnd/vnodeSnapshot.c b/source/dnode/vnode/src/vnd/vnodeSnapshot.c index bfddeedd78..f19068ea88 100644 --- a/source/dnode/vnode/src/vnd/vnodeSnapshot.c +++ b/source/dnode/vnode/src/vnd/vnodeSnapshot.c @@ -87,6 +87,7 @@ void vnodeSnapReaderClose(SVSnapReader *pReader) { int32_t vnodeSnapRead(SVSnapReader *pReader, uint8_t **ppData, uint32_t *nData) { int32_t code = 0; SVnode *pVnode = pReader->pVnode; + int32_t vgId = TD_VID(pReader->pVnode); // CONFIG ============== // FIXME: if commit multiple times and the config changed? @@ -220,30 +221,30 @@ int32_t vnodeSnapRead(SVSnapReader *pReader, uint8_t **ppData, uint32_t *nData) } // STREAM ============ - vInfo("stream task start"); + vInfo("vgId:%d stream task start", vgId); if (!pReader->streamTaskDone) { if (pReader->pStreamTaskReader == NULL) { - vInfo("stream task start 1"); code = streamTaskSnapReaderOpen(pReader->pVnode->pTq, pReader->sver, pReader->sver, &pReader->pStreamTaskReader); if (code) { - vInfo("stream task start err"); + vError("vgId:%d open streamtask snapshot reader failed, code:%s", vgId, tstrerror(code)); goto _err; } } + code = streamTaskSnapRead(pReader->pStreamTaskReader, ppData); - vInfo("stream task start 2"); if (code) { - vInfo("stream task start 3"); + vError("vgId:%d error happens during read data from streatask snapshot, code:%s", vgId, tstrerror(code)); goto _err; } else { if (*ppData) { + vInfo("vgId:%d no streamTask snapshot", vgId); goto _exit; - vInfo("stream task start 4"); } else { pReader->streamTaskDone = 1; code = streamTaskSnapReaderClose(pReader->pStreamTaskReader); - vInfo("stream task start 5"); - if (code) goto _err; + if (code) { + goto _err; + } pReader->pStreamTaskReader = NULL; } } @@ -305,15 +306,15 @@ _exit: pReader->index++; *nData = sizeof(SSnapDataHdr) + pHdr->size; pHdr->index = pReader->index; - vDebug("vgId:%d, vnode snapshot read data, index:%" PRId64 " type:%d blockLen:%d ", TD_VID(pReader->pVnode), - pReader->index, pHdr->type, *nData); + vDebug("vgId:%d, vnode snapshot read data, index:%" PRId64 " type:%d blockLen:%d ", vgId, pReader->index, + pHdr->type, *nData); } else { - vInfo("vgId:%d, vnode snapshot read data end, index:%" PRId64, TD_VID(pReader->pVnode), pReader->index); + vInfo("vgId:%d, vnode snapshot read data end, index:%" PRId64, vgId, pReader->index); } return code; _err: - vError("vgId:%d, vnode snapshot read failed since %s", TD_VID(pReader->pVnode), tstrerror(code)); + vError("vgId:%d, vnode snapshot read failed since %s", vgId, tstrerror(code)); return code; }