fix too long log split alarm #915
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
yyuuttaaoo
requested changes
Jun 8, 2023
core/profiler/LogtailAlarm.h
Outdated
| @@ -90,7 +90,8 @@ enum LogtailAlarmType { | |||
| OBSERVER_INIT_ALARM = 61, | |||
| OBSERVER_RUNTIME_ALARM = 62, | |||
| OBSERVER_STOP_ALARM = 63, | |||
| ALL_LOGTAIL_ALARM_NUM = 64 | |||
| ALL_LOGTAIL_ALARM_NUM = 64, | |||
| LOG_TOO_LONG_SPLIT_ALARM = 65 | |||
There was a problem hiding this comment.
上面有SPLIT_LOG_FAIL_ALARM，这里是不是直接复用一下。
另外，增加ALARM类型的话，ALL_LOGTAIL_ALARM_NUM总应该在最后，表达ALARM类型总数
core/reader/LogFileReader.cpp
Outdated
| @@ -1632,6 +1632,13 @@ void LogFileReader::ReadUTF8(char*& bufferptr, size_t* size, int64_t end, bool& | |||
| } | |||
|
|
|||
| if (moreData && nbytes == 0) { | |||
| LOG_WARNING(sLogger, ("Log is too long and is splitted at position", mLastFilePos + nbytes)); | |||
There was a problem hiding this comment.
这个warning信息不全，最好加上文件名和inode信息
Log is too long and forced to be split at offset: xxx file: xxx inode: xxx log: xxx(前1024B)
yyuuttaaoo
approved these changes
Jun 12, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
超长日志被截断可以分为两种情况：
moreData为 true，nBytes为 0。moreData为 true，readCharCount为 0。moreData为 true，readCharCount为 0（因为之前的日志被LastMatchedLine截断了，因此，如果需要匹配BeginReg，那么一定是在开头，所以nBytes为 0。）moreData为 true，resultCharCount为 0。