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

TD-2371

This commit is contained in:
Shengliang Guan 2020-12-08 10:28:13 +08:00
parent aa1a5700fb
commit aa3df5f7fa
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/util/src/tlog.c
View File

@ -287,7 +287,6 @@ static int32_t taosOpenLogFile(char *fn, int32_t maxLines, int32_t maxFileNum) {
tsLogObj.fileNum = maxFileNum; tsLogObj.fileNum = maxFileNum;
taosGetLogFileName(fn); taosGetLogFileName(fn);
if (strlen(fn) < LOG_FILE_NAME_LEN + 50 - 2) { if (strlen(fn) < LOG_FILE_NAME_LEN + 50 - 2) {
strcpy(name, fn); strcpy(name, fn);
strcat(name, ".0"); strcat(name, ".0");

39
src/util/src/tnote.c
View File

@ -53,7 +53,7 @@ void taosInitNotes() {
taosInitNote(tsNumOfLogLines, 1, &tsHttpNote, name); taosInitNote(tsNumOfLogLines, 1, &tsHttpNote, name);
} }
if (tscEmbedded == 0) { if (tscEmbedded == 1) {
snprintf(name, TSDB_FILENAME_LEN * 2, "%s/note", tsLogDir); snprintf(name, TSDB_FILENAME_LEN * 2, "%s/note", tsLogDir);
taosInitNote(tsNumOfLogLines, 1, &tsErrorNote, name); taosInitNote(tsNumOfLogLines, 1, &tsErrorNote, name);
} }
@ -170,36 +170,37 @@ void taosGetNoteName(char *fn, SNoteObj *pNote) {
} }
int32_t taosOpenNoteWithMaxLines(char *fn, int32_t maxLines, int32_t maxNoteNum, SNoteObj *pNote) { int32_t taosOpenNoteWithMaxLines(char *fn, int32_t maxLines, int32_t maxNoteNum, SNoteObj *pNote) {
char name[NOTE_FILE_NAME_LEN * 2] = "\0"; char name[NOTE_FILE_NAME_LEN * 2] = {0};
int32_t size; int32_t size;
struct stat notestat0, notestat1; struct stat logstat0, logstat1;
pNote->maxLines = maxLines; pNote->maxLines = maxLines;
pNote->fileNum = maxNoteNum; pNote->fileNum = maxNoteNum;
taosGetNoteName(fn, pNote); taosGetNoteName(fn, pNote);
if (strlen(fn) > NOTE_FILE_NAME_LEN * 2 - 2) { if (strlen(fn) < NOTE_FILE_NAME_LEN + 50 - 2) {
fprintf(stderr, "the len of file name overflow:%s\n", fn); strcpy(name, fn);
return -1; strcat(name, ".0");
} }
bool log0Exist = stat(name, &logstat0) >= 0;
strcpy(name, fn); if (strlen(fn) < NOTE_FILE_NAME_LEN + 50 - 2) {
strcat(name, ".0");
// if none of the note files exist, open 0, if both exists, open the old one
if (stat(name, &notestat0) < 0) {
pNote->flag = 0;
} else {
strcpy(name, fn); strcpy(name, fn);
strcat(name, ".1"); strcat(name, ".1");
if (stat(name, &notestat1) < 0) { }
pNote->flag = 1; bool log1Exist = stat(name, &logstat1) >= 0;
} else {
pNote->flag = (notestat0.st_mtime > notestat1.st_mtime) ? 0 : 1; if (!log0Exist && !log1Exist) {
} pNote->flag = 0;
} else if (!log1Exist) {
pNote->flag = 0;
} else if (!log0Exist) {
pNote->flag = 1;
} else {
pNote->flag = (logstat0.st_mtime > logstat1.st_mtime) ? 0 : 1;
} }
char noteName[NOTE_FILE_NAME_LEN * 2] = "\0"; char noteName[NOTE_FILE_NAME_LEN * 2] = {0};
sprintf(noteName, "%s.%d", pNote->name, pNote->flag); sprintf(noteName, "%s.%d", pNote->name, pNote->flag);
pthread_mutex_init(&pNote->mutex, NULL); pthread_mutex_init(&pNote->mutex, NULL);