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

optimize fix condition

This commit is contained in:
Liu Jicong 2022-09-22 00:36:04 +08:00
parent a6733dbbd1
commit 78b4d10249
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/libs/wal/src/walMeta.c
View File

@ -257,6 +257,10 @@ int walCheckAndRepairIdx(SWal* pWal) {
} }
taosFStatFile(pIdxFile, &fsize, NULL); taosFStatFile(pIdxFile, &fsize, NULL);
if (fsize == (pFileInfo->lastVer - pFileInfo->firstVer + 1) * sizeof(SWalIdxEntry)) {
taosCloseFile(&pIdxFile);
continue;
}
int32_t left = fsize % sizeof(SWalIdxEntry); int32_t left = fsize % sizeof(SWalIdxEntry);
int64_t offset = taosLSeekFile(pIdxFile, -left, SEEK_END); int64_t offset = taosLSeekFile(pIdxFile, -left, SEEK_END);
@ -267,7 +271,7 @@ int walCheckAndRepairIdx(SWal* pWal) {
} }
offset -= sizeof(SWalIdxEntry); offset -= sizeof(SWalIdxEntry);
SWalIdxEntry idxEntry = {0}; SWalIdxEntry idxEntry = {.ver = pFileInfo->firstVer};
while (1) { while (1) {
if (offset < 0) { if (offset < 0) {
taosLSeekFile(pIdxFile, 0, SEEK_SET); taosLSeekFile(pIdxFile, 0, SEEK_SET);
@ -306,7 +310,8 @@ int walCheckAndRepairIdx(SWal* pWal) {
if (idxEntry.ver != ckHead.head.version) { if (idxEntry.ver != ckHead.head.version) {
// todo truncate this idx also // todo truncate this idx also
taosCloseFile(&pLogFile); taosCloseFile(&pLogFile);
wError("vgId:%d, invalid repair case", pWal->cfg.vgId); wError("vgId:%d, invalid repair case, log seek to %ld to find ver %ld, actual ver %ld", pWal->cfg.vgId,
idxEntry.offset, idxEntry.ver, ckHead.head.version);
return -1; return -1;
} }
idxEntry.ver = ckHead.head.version + 1; idxEntry.ver = ckHead.head.version + 1;