feat: cache incomplete line in memory to avoid repeat read from disk #1142
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
| @@ -371,7 +374,8 @@ void LogFileReader::adjustParametersByRangeCheckpoints() { | |||
| return lhs->data.read_offset() < rhs->data.read_offset(); | |||
| }); | |||
| auto& firstCpt = uncommittedCheckpoints.front()->data; | |||
| mLastReadPos = mLastFilePos = firstCpt.read_offset(); | |||
| mLastFilePos = firstCpt.read_offset(); | |||
messixukejia
requested changes
Sep 21, 2023
| APSARA_TEST_FALSE_FATAL(moreData); | ||
| APSARA_TEST_EQUAL_FATAL(0UL, reader2.mCache.size()); | ||
| reader1.DumpMetaToMem(false); | ||
| } |
There was a problem hiding this comment.
配置变更场景模拟下用例，在checkpoint中，恢复后继续能够读取，保证数据连续性
messixukejia
requested changes
Sep 21, 2023
| reader.ReadGBK(logBuffer, fileSize, moreData); | ||
| APSARA_TEST_TRUE_FATAL(moreData); | ||
| std::string expectedPart(expectedContent.get()); | ||
| expectedPart.resize(expectedPart.rfind("iLogtail") - 1); | ||
| APSARA_TEST_STREQ_FATAL(expectedPart.c_str(), logBuffer.rawBuffer.data()); | ||
| // second read | ||
| APSARA_TEST_GE_FATAL(reader.mCache.size(), 0UL); |
There was a problem hiding this comment.
第一次读有缓存，第二次读续上这种是不是没有用例？
messixukejia
approved these changes
Sep 22, 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.
活跃的磁盘缓存会被容器记入内存占用。ilogtail原来重复读取一个位置的行为会将缓存标记活跃，从而使被采集的容器内存上涨，该补丁应该可以大幅减缓这一现象。
TEST: