From 42231d76910c03cb51ba25f17f1282877f9bc643 Mon Sep 17 00:00:00 2001 From: afwerar <1296468573@qq.com> Date: Sat, 2 Apr 2022 10:31:07 +0800 Subject: [PATCH 1/4] [TD-13756]: log file open fail error. --- source/util/src/tlog.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/util/src/tlog.c b/source/util/src/tlog.c index ef15f44f8f..f5ca634099 100644 --- a/source/util/src/tlog.c +++ b/source/util/src/tlog.c @@ -347,12 +347,13 @@ static int32_t taosOpenLogFile(char *fn, int32_t maxLines, int32_t maxFileNum) { taosThreadMutexInit(&tsLogObj.logMutex, NULL); taosUmaskFile(0); - tsLogObj.logHandle->pFile = taosOpenFile(fileName, TD_FILE_CTEATE | TD_FILE_WRITE); + TdFilePtr pFile = taosOpenFile(fileName, TD_FILE_CTEATE | TD_FILE_WRITE); - if (tsLogObj.logHandle->pFile == NULL) { + if (pFile == NULL) { printf("\nfailed to open log file:%s, reason:%s\n", fileName, strerror(errno)); return -1; } + tsLogObj.logHandle->pFile = pFile; taosLockLogFile(tsLogObj.logHandle->pFile); // only an estimate for number of lines From e9f2c1cdc0c7892f0a4df3c75dc334db957c3115 Mon Sep 17 00:00:00 2001 From: afwerar <1296468573@qq.com> Date: Sat, 2 Apr 2022 10:33:35 +0800 Subject: [PATCH 2/4] [TD-13756]: log file open fail error. --- source/util/src/tlog.c | 1 + 1 file changed, 1 insertion(+) diff --git a/source/util/src/tlog.c b/source/util/src/tlog.c index f5ca634099..11e6edf022 100644 --- a/source/util/src/tlog.c +++ b/source/util/src/tlog.c @@ -353,6 +353,7 @@ static int32_t taosOpenLogFile(char *fn, int32_t maxLines, int32_t maxFileNum) { printf("\nfailed to open log file:%s, reason:%s\n", fileName, strerror(errno)); return -1; } + taosCloseFile(&tsLogObj.logHandle->pFile); tsLogObj.logHandle->pFile = pFile; taosLockLogFile(tsLogObj.logHandle->pFile); From 131bf46854b1afdc01185c6a483efe3d60376b26 Mon Sep 17 00:00:00 2001 From: afwerar <1296468573@qq.com> Date: Sat, 2 Apr 2022 10:51:46 +0800 Subject: [PATCH 3/4] [TD-13756]: log file open fail error. --- source/util/src/tlog.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/util/src/tlog.c b/source/util/src/tlog.c index 11e6edf022..fe02070bcb 100644 --- a/source/util/src/tlog.c +++ b/source/util/src/tlog.c @@ -353,7 +353,9 @@ static int32_t taosOpenLogFile(char *fn, int32_t maxLines, int32_t maxFileNum) { printf("\nfailed to open log file:%s, reason:%s\n", fileName, strerror(errno)); return -1; } - taosCloseFile(&tsLogObj.logHandle->pFile); + TdFilePtr pOldFile = tsLogObj.logHandle->pFile; + taosUnLockLogFile(pOldFile); + taosCloseFile(&pOldFile); tsLogObj.logHandle->pFile = pFile; taosLockLogFile(tsLogObj.logHandle->pFile); From 563500862f6eaf0a6f1b8a08e252f03ac2c14371 Mon Sep 17 00:00:00 2001 From: afwerar <1296468573@qq.com> Date: Sat, 2 Apr 2022 10:54:17 +0800 Subject: [PATCH 4/4] [TD-13756]: log file open fail error. --- source/util/src/tlog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/util/src/tlog.c b/source/util/src/tlog.c index fe02070bcb..1f26ab7c51 100644 --- a/source/util/src/tlog.c +++ b/source/util/src/tlog.c @@ -354,9 +354,9 @@ static int32_t taosOpenLogFile(char *fn, int32_t maxLines, int32_t maxFileNum) { return -1; } TdFilePtr pOldFile = tsLogObj.logHandle->pFile; + tsLogObj.logHandle->pFile = pFile; taosUnLockLogFile(pOldFile); taosCloseFile(&pOldFile); - tsLogObj.logHandle->pFile = pFile; taosLockLogFile(tsLogObj.logHandle->pFile); // only an estimate for number of lines