From 9c24db5d03f79de5ddf836634a4999f34bea9455 Mon Sep 17 00:00:00 2001 From: xiao-77 Date: Tue, 12 Nov 2024 17:28:46 +0800 Subject: [PATCH] Add error log and close wal file. --- source/libs/wal/src/walMgmt.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/source/libs/wal/src/walMgmt.c b/source/libs/wal/src/walMgmt.c index f9c0f05250..067e53223c 100644 --- a/source/libs/wal/src/walMgmt.c +++ b/source/libs/wal/src/walMgmt.c @@ -93,17 +93,22 @@ static int32_t walInitLock(SWal *pWal) { int32_t walInitWriteFileForSkip(SWal *pWal) { TdFilePtr pIdxTFile, pLogTFile; int64_t fileFirstVer = 0; + int32_t code = 0; char fnameStr[WAL_FILE_LEN]; walBuildIdxName(pWal, fileFirstVer, fnameStr); pIdxTFile = taosOpenFile(fnameStr, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_APPEND); if (pIdxTFile == NULL) { - TAOS_RETURN(terrno); + wError("vgId:%d, failed to open file since %s", pWal->cfg.vgId, tstrerror(terrno)); + code = terrno; + goto _exit; } walBuildLogName(pWal, fileFirstVer, fnameStr); pLogTFile = taosOpenFile(fnameStr, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_APPEND); if (pLogTFile == NULL) { - TAOS_RETURN(terrno); + wError("vgId:%d, failed to open file since %s", pWal->cfg.vgId, tstrerror(terrno)); + code = terrno; + goto _exit; } // switch file pWal->pIdxFile = pIdxTFile; @@ -111,10 +116,15 @@ int32_t walInitWriteFileForSkip(SWal *pWal) { SWalFileInfo fileInfo; (void)memset(&fileInfo, -1, sizeof(SWalFileInfo)); if (!taosArrayPush(pWal->fileInfoSet, &fileInfo)) { - TAOS_RETURN(TSDB_CODE_FAILED); + wError("vgId:%d, failed to push fileInfo into array since %s", pWal->cfg.vgId, tstrerror(terrno)); + code = terrno; + goto _exit; } pWal->writeCur = 0; - TAOS_RETURN(TSDB_CODE_SUCCESS); +_exit: + (void)taosCloseFile(&pIdxTFile); + (void)taosCloseFile(&pLogTFile); + TAOS_RETURN(code); } SWal *walOpen(const char *path, SWalCfg *pCfg) {