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

Merge pull request #29480 from taosdata/fix/TD-33444-3.0m 

fix: eliminate the risk of deadlock when switching log file
This commit is contained in:
Shengliang Guan 2025-01-06 15:08:04 +08:00 committed by GitHub
parent ee89a84ff2 f2735f43bc
commit 1706b974b2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/util/src/tlog.c
View File

@ -411,9 +411,9 @@ static OldFileKeeper *taosOpenNewFile() {
TdFilePtr pFile = taosOpenFile(name, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_TRUNC); TdFilePtr pFile = taosOpenFile(name, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_TRUNC);
if (pFile == NULL) { if (pFile == NULL) {
tsLogObj.openInProgress = 0; tsLogObj.flag ^= 1;
tsLogObj.lines = tsNumOfLogLines - 1000; tsLogObj.lines = tsNumOfLogLines - 1000;
uError("open new log file fail! reason:%s, reuse lastlog", strerror(errno)); uError("open new log file %s fail! reason:%s, reuse lastlog", name, tstrerror(terrno));
return NULL; return NULL;
} }
@ -425,7 +425,6 @@ static OldFileKeeper *taosOpenNewFile() {
TdFilePtr pOldFile = tsLogObj.logHandle->pFile; TdFilePtr pOldFile = tsLogObj.logHandle->pFile;
tsLogObj.logHandle->pFile = pFile; tsLogObj.logHandle->pFile = pFile;
tsLogObj.lines = 0; tsLogObj.lines = 0;
tsLogObj.openInProgress = 0;
OldFileKeeper *oldFileKeeper = taosMemoryMalloc(sizeof(OldFileKeeper)); OldFileKeeper *oldFileKeeper = taosMemoryMalloc(sizeof(OldFileKeeper));
if (oldFileKeeper == NULL) { if (oldFileKeeper == NULL) {
uError("create old log keep info faild! mem is not enough."); uError("create old log keep info faild! mem is not enough.");
@ -468,7 +467,9 @@ static int32_t taosOpenNewLogFile() {
OldFileKeeper *oldFileKeeper = taosOpenNewFile(); OldFileKeeper *oldFileKeeper = taosOpenNewFile();
if (!oldFileKeeper) { if (!oldFileKeeper) {
tsLogObj.openInProgress = 0;
TAOS_UNUSED(taosThreadMutexUnlock(&tsLogObj.logMutex)); TAOS_UNUSED(taosThreadMutexUnlock(&tsLogObj.logMutex));
(void)taosThreadAttrDestroy(&attr);
return terrno; return terrno;
} }
if (taosThreadCreate(&thread, &attr, taosThreadToCloseOldFile, oldFileKeeper) != 0) { if (taosThreadCreate(&thread, &attr, taosThreadToCloseOldFile, oldFileKeeper) != 0) {
@ -476,6 +477,7 @@ static int32_t taosOpenNewLogFile() {
taosMemoryFreeClear(oldFileKeeper); taosMemoryFreeClear(oldFileKeeper);
} }
(void)taosThreadAttrDestroy(&attr); (void)taosThreadAttrDestroy(&attr);
tsLogObj.openInProgress = 0;
} }
(void)taosThreadMutexUnlock(&tsLogObj.logMutex); (void)taosThreadMutexUnlock(&tsLogObj.logMutex);
@ -728,10 +730,7 @@ static inline void taosPrintLogImp(ELogLevel level, int32_t dflag, const char *b
if (tsNumOfLogLines > 0) { if (tsNumOfLogLines > 0) {
TAOS_UNUSED(atomic_add_fetch_32(&tsLogObj.lines, 1)); TAOS_UNUSED(atomic_add_fetch_32(&tsLogObj.lines, 1));
if ((tsLogObj.lines > tsNumOfLogLines) && (tsLogObj.openInProgress == 0)) { if ((tsLogObj.lines > tsNumOfLogLines) && (tsLogObj.openInProgress == 0)) {
int32_t code = taosOpenNewLogFile(); TAOS_UNUSED(taosOpenNewLogFile());
if (code != 0) {
uError("failed to open new log file, reason:%s", tstrerror(code));
}
} }
} }
} }