From 4bc05d33eb33a4173767494479be40bc01f95ce6 Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Tue, 27 Oct 2020 07:41:01 +0000 Subject: [PATCH] hotfix/TD-1685 --- src/wal/src/walMain.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/wal/src/walMain.c b/src/wal/src/walMain.c index 1826002042..3492246a6f 100644 --- a/src/wal/src/walMain.c +++ b/src/wal/src/walMain.c @@ -250,11 +250,13 @@ int walWrite(void *handle, SWalHead *pHead) { if (taosTWrite(pWal->fd, pHead, contLen) != contLen) { wError("wal:%s, failed to write(%s)", pWal->name, strerror(errno)); terrno = TAOS_SYSTEM_ERROR(errno); + return terrno; } else { pWal->version = pHead->version; } + ASSERT(contLen == pHead->len + sizeof(SWalHead)); - return terrno; + return 0; } void walFsync(void *handle) { @@ -424,7 +426,7 @@ static int walRestoreWalFile(SWal *pWal, void *pVnode, FWalWrite writeFp) { if (!taosCheckChecksumWhole((uint8_t *)pHead, sizeof(SWalHead))) { wWarn("wal:%s, cksum is messed up, skip the rest of file", name); terrno = TSDB_CODE_WAL_FILE_CORRUPTED; - // ASSERT(false); + ASSERT(false); break; }