Support handle invalid logs #19
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,7 +6,7 @@ on: | |
| - master | ||
|
|
||
| jobs: | ||
| test: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v1 | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -73,31 +73,25 @@ func resolveFiles(logFilePath string, beginTime, endTime int64) ([]logFile, erro | |
| return nil | ||
| } | ||
| reader := bufio.NewReader(file) | ||
|
|
||
| firstItem, err := readFirstValidLog(reader, 0) | ||
| if err != nil { | ||
| skipFiles = append(skipFiles, file) | ||
| return nil | ||
| } | ||
|
|
||
| lastItem, err := readLastValidLog(file, 0) | ||
| if err != nil { | ||
| skipFiles = append(skipFiles, file) | ||
| return nil | ||
| } | ||
|
|
||
| // Reset position to the start and skip this file if cannot seek to start | ||
| if _, err := file.Seek(0, io.SeekStart); err != nil { | ||
| skipFiles = append(skipFiles, file) | ||
| return nil | ||
| } | ||
|
|
||
| if beginTime > lastItem.Time || endTime < firstItem.Time { | ||
| skipFiles = append(skipFiles, file) | ||
| } else { | ||
|
|
@@ -109,18 +103,63 @@ func resolveFiles(logFilePath string, beginTime, endTime int64) ([]logFile, erro | |
| } | ||
| return nil | ||
| }) | ||
|
|
||
| defer func() { | ||
| for _, f := range skipFiles { | ||
| _ = f.Close() | ||
| } | ||
| }() | ||
|
|
||
| // Sort by start time | ||
| sort.Slice(logFiles, func(i, j int) bool { | ||
| return logFiles[i].begin < logFiles[j].begin | ||
| }) | ||
| return logFiles, err | ||
| } | ||
|
|
||
| // parameter tryLines: if value is 0, means unlimited | ||
| func readFirstValidLog(reader *bufio.Reader, tryLines int64) (*pb.LogMessage, error) { | ||
| var tried int64 | ||
| for { | ||
| line, err := readLine(reader) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| item, err := parseLogItem(line) | ||
| if err == nil { | ||
| return item, nil | ||
| } | ||
| tried++ | ||
| if tryLines > 0 && tried >= tryLines { | ||
| break | ||
| } | ||
| } | ||
| return nil, errors.New("not a valid log file") | ||
| } | ||
|
|
||
| // parameter tryLines: if value is 0, means unlimited | ||
| func readLastValidLog(file *os.File, tryLines int64) (*pb.LogMessage, error) { | ||
| var tried int64 | ||
| var endCursor int64 | ||
| for { | ||
| line := readLineReverse(file, endCursor) | ||
| // read out the file | ||
| if len(line) == 0 { | ||
| break | ||
| } | ||
| endCursor -= int64(len(line)) | ||
| item, err := parseLogItem(line) | ||
| if err == nil { | ||
| return item, nil | ||
| } | ||
| tried++ | ||
| if tryLines > 0 && tried >= tryLines { | ||
| break | ||
| } | ||
| } | ||
| return nil, errors.New("not a valid log file") | ||
| } | ||
|
|
||
| // Read a line from a reader. | ||
| func readLine(reader *bufio.Reader) (string, error) { | ||
| var line, b []byte | ||
|
|
@@ -136,20 +175,22 @@ func readLine(reader *bufio.Reader) (string, error) { | |
| return string(line), nil | ||
| } | ||
|
|
||
| // Read a line from the end of a file. | ||
| // TODO: read byte by byte is low efficiency, we can improve it, for example, read 1024 bytes one time | ||
| func readLineReverse(file *os.File, endCursor int64) string { | ||
| var line []byte | ||
| var cursor = endCursor | ||
| stat, _ := file.Stat() | ||
| filesize := stat.Size() | ||
| for { | ||
| cursor-- | ||
| file.Seek(cursor, io.SeekEnd) | ||
|
There was a problem hiding this comment. What if the log has appended some new logs after the file is opened when calling There was a problem hiding this comment. Nice catch, I think we should add some tests for these scenarios. There was a problem hiding this comment. ok, I will do some tests to check it. There was a problem hiding this comment. Hi @lonng , add a test method
There was a problem hiding this comment. will continue to fix it in this PR. There was a problem hiding this comment. Fixed it by |
||
|
|
||
| char := make([]byte, 1) | ||
| file.Read(char) | ||
|
|
||
| // stop if we find a line | ||
| if cursor != endCursor-1 && (char[0] == 10 || char[0] == 13) { | ||
| break | ||
| } | ||
| line = append(line, char[0]) | ||
|
|
@@ -163,7 +204,7 @@ func readLastLine(file *os.File) string { | |
| return string(line) | ||
| } | ||
|
|
||
| // ParseLogLevel returns LogLevel from string and return LogLevel_Info if | ||
| // the string is an invalid level string | ||
| func ParseLogLevel(s string) pb.LogLevel { | ||
| switch s { | ||
|
|
@@ -244,6 +285,7 @@ type logIterator struct { | |
| fileIndex int | ||
| reader *bufio.Reader | ||
| pending []*os.File | ||
| preTime int64 | ||
| } | ||
|
|
||
| // The Close method close all resources the iterator has. | ||
|
|
@@ -274,21 +316,33 @@ nextLine: | |
| iter.reader.Reset(iter.pending[iter.fileIndex]) | ||
| continue | ||
| } | ||
| line = strings.TrimSpace(line) | ||
| if len(line) == 0 { | ||
| continue | ||
| } | ||
| item, err := parseLogItem(line) | ||
| if err != nil { | ||
| if iter.preTime == 0 { | ||
| continue | ||
| } | ||
| // handle invalid log | ||
| // make whole line as log message with pre time and unknown log_level | ||
baurine marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| item = &pb.LogMessage{ | ||
| Time: iter.preTime, | ||
| Level: pb.LogLevel_UNKNOWN, | ||
| Message: line, | ||
| } | ||
| } else { | ||
| iter.preTime = item.Time | ||
| } | ||
| if item.Time > iter.end { | ||
| return nil, io.EOF | ||
| } | ||
| if item.Time < iter.begin { | ||
| continue | ||
| } | ||
| // always keep unknown log_level | ||
| if item.Level > pb.LogLevel_UNKNOWN && iter.levelFlag != 0 && iter.levelFlag&(1<<item.Level) == 0 { | ||
| continue | ||
| } | ||
| if len(iter.patterns) > 0 { | ||
|
|
||
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we refine by this way? (not sure whether it has some pitfalls.)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure, we can add a todo here.