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

feat:[TS-3718]save slow log file one day one file

This commit is contained in:
wangmm0220 2024-08-06 18:02:01 +08:00
parent 9c2adc59bb
commit 7f8df84106
1 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,9 +68,8 @@ typedef struct {
int32_t lines; int32_t lines;
int32_t flag; int32_t flag;
int32_t openInProgress; int32_t openInProgress;
int32_t openInProgressSlowLog;
int64_t lastKeepFileSec; int64_t lastKeepFileSec;
char slowLogDay[LOG_FILE_DAY_LEN]; int64_t timestampToday;
pid_t pid; pid_t pid;
char logName[PATH_MAX]; char logName[PATH_MAX];
char slowLogName[PATH_MAX]; char slowLogName[PATH_MAX];
@ -136,6 +135,7 @@ static int32_t taosPushLogBuffer(SLogBuff *pLogBuf, const char *msg, int32_t m
static SLogBuff *taosLogBuffNew(int32_t bufSize); static SLogBuff *taosLogBuffNew(int32_t bufSize);
static void taosCloseLogByFd(TdFilePtr pFile); static void taosCloseLogByFd(TdFilePtr pFile);
static int32_t taosInitNormalLog(const char *fn, int32_t maxFileNum); static int32_t taosInitNormalLog(const char *fn, int32_t maxFileNum);
static void taosWriteLog(SLogBuff *pLogBuf);
static int32_t taosStartLog() { static int32_t taosStartLog() {
TdThreadAttr threadAttr; TdThreadAttr threadAttr;
(void)taosThreadAttrInit(&threadAttr); (void)taosThreadAttrInit(&threadAttr);
@ -153,6 +153,18 @@ static void getDay(char* buf){
(void)strftime(buf, LOG_FILE_DAY_LEN, "%Y-%m-%d", &tmInfo); (void)strftime(buf, LOG_FILE_DAY_LEN, "%Y-%m-%d", &tmInfo);
} }
} }
static int64_t getTimestampToday() {
time_t t = taosTime(NULL);
struct tm tm;
(void) taosLocalTime(&t, &tm, NULL);
tm.tm_hour = 0;
tm.tm_min = 0;
tm.tm_sec = 0;
return (int64_t)taosMktime(&tm);
}
static void getFullPathName(char* fullName, const char* logName){ static void getFullPathName(char* fullName, const char* logName){
if (strlen(tsLogDir) != 0) { if (strlen(tsLogDir) != 0) {
char lastC = tsLogDir[strlen(tsLogDir) - 1]; char lastC = tsLogDir[strlen(tsLogDir) - 1];
@ -184,6 +196,7 @@ int32_t taosInitSlowLog() {
getDay(day); getDay(day);
(void)snprintf(name, PATH_MAX + LOG_FILE_DAY_LEN, "%s.%s", tsLogObj.slowLogName, day); (void)snprintf(name, PATH_MAX + LOG_FILE_DAY_LEN, "%s.%s", tsLogObj.slowLogName, day);
tsLogObj.timestampToday = getTimestampToday();
tsLogObj.slowHandle = taosLogBuffNew(LOG_SLOW_BUF_SIZE); tsLogObj.slowHandle = taosLogBuffNew(LOG_SLOW_BUF_SIZE);
if (tsLogObj.slowHandle == NULL) return terrno; if (tsLogObj.slowHandle == NULL) return terrno;
@ -374,20 +387,31 @@ static int32_t taosOpenNewLogFile() {
return 0; return 0;
} }
static void taosOpenNewSlowLogFile(char* day) { static void taosOpenNewSlowLogFile(int64_t today) {
(void)taosThreadMutexLock(&tsLogObj.logMutex);
if (tsLogObj.timestampToday == today) {
uInfo("timestampToday is already equal to today, no need to open new slow log file");
(void)taosThreadMutexUnlock(&tsLogObj.logMutex);
return;
}
taosWriteLog(tsLogObj.slowHandle);
char day[LOG_FILE_DAY_LEN] = {0};
getDay(day);
TdFilePtr pFile = NULL; TdFilePtr pFile = NULL;
char name[PATH_MAX + LOG_FILE_DAY_LEN] = {0}; char name[PATH_MAX + LOG_FILE_DAY_LEN] = {0};
(void)snprintf(name, PATH_MAX + LOG_FILE_DAY_LEN, "%s.%s", tsLogObj.slowLogName, day); (void)snprintf(name, PATH_MAX + LOG_FILE_DAY_LEN, "%s.%s", tsLogObj.slowLogName, day);
pFile = taosOpenFile(name, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_APPEND); pFile = taosOpenFile(name, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_APPEND);
if (pFile == NULL) { if (pFile == NULL) {
uError("open new log file fail! reason:%s, reuse lastlog", strerror(errno)); uError("open new log file fail! reason:%s, reuse lastlog", strerror(errno));
(void)taosThreadMutexUnlock(&tsLogObj.logMutex);
return; return;
} }
TdFilePtr pOldFile = tsLogObj.slowHandle->pFile; TdFilePtr pOldFile = tsLogObj.slowHandle->pFile;
tsLogObj.slowHandle->pFile = pFile; tsLogObj.slowHandle->pFile = pFile;
(void)taosCloseFile(&pOldFile); (void)taosCloseFile(&pOldFile);
tstrncpy(tsLogObj.slowLogDay, day, LOG_FILE_DAY_LEN); tsLogObj.timestampToday = today;
(void)taosThreadMutexUnlock(&tsLogObj.logMutex);
} }
void taosResetLog() { void taosResetLog() {
@ -456,9 +480,9 @@ static void decideLogFileNameFlag(){
if (strlen(tsLogObj.logName) < PATH_MAX + 50 - 2) { if (strlen(tsLogObj.logName) < PATH_MAX + 50 - 2) {
strcpy(name, tsLogObj.logName); strcpy(name, tsLogObj.logName);
strcat(name, ".0"); strcat(name, ".0");
log0Exist = taosStatFile(name, NULL, &logstat0_mtime, NULL) >= 0; log0Exist = taosStatFile(name, NULL, &logstat0_mtime, NULL) == 0;
name[strlen(name) - 1] = '1'; name[strlen(name) - 1] = '1';
log1Exist = taosStatFile(name, NULL, &logstat1_mtime, NULL) >= 0; log1Exist = taosStatFile(name, NULL, &logstat1_mtime, NULL) == 0;
} }
// if none of the log files exist, open 0, if both exists, open the old one // if none of the log files exist, open 0, if both exists, open the old one
@ -627,20 +651,14 @@ void taosPrintLongString(const char *flags, ELogLevel level, int32_t dflag, cons
taosMemoryFree(buffer); taosMemoryFree(buffer);
} }
static void checkSwitchSlowLogFile(){
char day[LOG_FILE_DAY_LEN] = {0};
getDay(day);
(void)taosThreadMutexLock(&tsLogObj.logMutex);
if (strlen(tsLogObj.slowLogDay) == 0) {
tstrncpy(tsLogObj.slowLogDay, day, LOG_FILE_DAY_LEN);
}else if (strcmp(tsLogObj.slowLogDay, day) != 0) {
taosOpenNewSlowLogFile(day);
}
(void)taosThreadMutexUnlock(&tsLogObj.logMutex);
}
void taosPrintSlowLog(const char *format, ...) { void taosPrintSlowLog(const char *format, ...) {
if (!osLogSpaceSufficient()) return; if (!osLogSpaceSufficient()) return;
int64_t today = getTimestampToday();
if (today != tsLogObj.timestampToday){
taosOpenNewSlowLogFile(today);
}
char *buffer = taosMemoryMalloc(LOG_MAX_LINE_DUMP_BUFFER_SIZE); char *buffer = taosMemoryMalloc(LOG_MAX_LINE_DUMP_BUFFER_SIZE);
int32_t len = taosBuildLogHead(buffer, ""); int32_t len = taosBuildLogHead(buffer, "");
@ -657,8 +675,6 @@ void taosPrintSlowLog(const char *format, ...) {
(void)atomic_add_fetch_64(&tsNumOfSlowLogs, 1); (void)atomic_add_fetch_64(&tsNumOfSlowLogs, 1);
checkSwitchSlowLogFile();
if (tsAsyncLog) { if (tsAsyncLog) {
(void)taosPushLogBuffer(tsLogObj.slowHandle, buffer, len); (void)taosPushLogBuffer(tsLogObj.slowHandle, buffer, len);
} else { } else {