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

Merge pull request #29031 from taosdata/fix/main/TD-33114 

fix(wal): crash at wal init write file.
This commit is contained in:
Shengliang Guan 2024-12-11 19:26:42 +08:00 committed by GitHub
parent 5456010a5a 78a283411c
commit 21aef4575e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/libs/wal/src/walWrite.c
View File

@ -349,7 +349,7 @@ _exit:
wError("vgId:%d, %s failed at line %d since %s", pWal->cfg.vgId, __func__, lino, tstrerror(code)); wError("vgId:%d, %s failed at line %d since %s", pWal->cfg.vgId, __func__, lino, tstrerror(code));
} }
TAOS_RETURN(TSDB_CODE_SUCCESS); TAOS_RETURN(code);
} }
static FORCE_INLINE int32_t walCheckAndRoll(SWal *pWal) { static FORCE_INLINE int32_t walCheckAndRoll(SWal *pWal) {
@ -706,8 +706,13 @@ _exit:
static int32_t walInitWriteFile(SWal *pWal) { static int32_t walInitWriteFile(SWal *pWal) {
TdFilePtr pIdxTFile, pLogTFile; TdFilePtr pIdxTFile, pLogTFile;
int64_t fileFirstVer = -1;
int32_t code = 0;
SWalFileInfo *pRet = taosArrayGetLast(pWal->fileInfoSet); SWalFileInfo *pRet = taosArrayGetLast(pWal->fileInfoSet);
int64_t fileFirstVer = pRet->firstVer; if (pRet == NULL) {
fileFirstVer = pWal->vers.lastVer + 1;
}
fileFirstVer = pRet->firstVer;
char fnameStr[WAL_FILE_LEN]; char fnameStr[WAL_FILE_LEN];
walBuildIdxName(pWal, fileFirstVer, fnameStr); walBuildIdxName(pWal, fileFirstVer, fnameStr);
@ -723,6 +728,13 @@ static int32_t walInitWriteFile(SWal *pWal) {
// switch file // switch file
pWal->pIdxFile = pIdxTFile; pWal->pIdxFile = pIdxTFile;
pWal->pLogFile = pLogTFile; pWal->pLogFile = pLogTFile;
if (taosArrayGetSize(pWal->fileInfoSet) == 0) {
code = walRollFileInfo(pWal);
if (code < 0) {
wError("vgId:%d, failed to roll file info while init write file since %s", pWal->cfg.vgId, terrstr());
TAOS_RETURN(code);
}
}
pWal->writeCur = taosArrayGetSize(pWal->fileInfoSet) - 1; pWal->writeCur = taosArrayGetSize(pWal->fileInfoSet) - 1;
TAOS_RETURN(TSDB_CODE_SUCCESS); TAOS_RETURN(TSDB_CODE_SUCCESS);