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

fix: eliminate the risk of deadlock when switching logs

This commit is contained in:
kailixu 2025-01-04 23:40:58 +08:00
parent a42d498169
commit f2735f43bc
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -411,7 +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) {
uError("open new log file fail! reason:%s, reuse lastlog", tstrerror(terrno)); tsLogObj.flag ^= 1;
tsLogObj.lines = tsNumOfLogLines - 1000;
uError("open new log file %s fail! reason:%s, reuse lastlog", name, tstrerror(terrno));
return NULL; return NULL;
} }
@ -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));
}
} }
} }
} }