fix: collect files in PV when another container restart or stop #2010
+438
−108
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
Abingcbc
force-pushed
the
abing/fix-container-pv
branch
4 times, most recently
from
dcd68aa to
3e5407b
Compare
Abingcbc
changed the title
Abingcbc
force-pushed
the
abing/fix-container-pv
branch
from
3e5407b to
6af14e0
Compare
Abingcbc
force-pushed
the
abing/fix-container-pv
branch
from
6af14e0 to
bfd097c
Compare
yyuuttaaoo
approved these changes
Jan 12, 2025
| "file inode", reader->GetDevInode().inode)("file size", reader->GetFileSize())); | ||
| ForceReadLogAndPush(reader); | ||
| reader->CloseFilePtr(); | ||
| // update container info one more time, ensure file is hold by same cotnainer |
There was a problem hiding this comment.
cotnainer -> container
messixukejia
requested changes
Jan 12, 2025
| @@ -206,6 +206,7 @@ void CheckPointManager::LoadFileCheckPoint(const Json::Value& root) { | |||
| string realFilePath; | |||
| int32_t fileOpenFlag = 0; // default, we close file ptr | |||
| int32_t containerStopped = 0; | |||
| string containerID; | |||
There was a problem hiding this comment.
这个场景E2E是否可以构造，是否有对应的用例？
| @@ -206,6 +206,7 @@ void CheckPointManager::LoadFileCheckPoint(const Json::Value& root) { | |||
| string realFilePath; | |||
| int32_t fileOpenFlag = 0; // default, we close file ptr | |||
| int32_t containerStopped = 0; | |||
| string containerID; | |||
| int32_t lastForceRead = 0; | |||
| int32_t idxInReaderArray = LogFileReader::CHECKPOINT_IDX_OF_NEW_READER_IN_ARRAY; | |||
yyuuttaaoo
reviewed
Jan 13, 2025
| if (discoveryConfig.first == nullptr) { | ||
| return false; | ||
| } | ||
| ContainerInfo* containerInfo = discoveryConfig.first->GetContainerPathByLogPath(mHostLogPathDir); |
There was a problem hiding this comment.
可能有问题，如果一个是主机上采集pv，一个是容器内，那么主机的是不会去更新container信息的，此时还能否将stop的container重置为空？
所以config信息是不是还是有用，不能只靠containerid
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.
问题
LoongCollector之前的设计中，每个目录只会对应一个容器。但在采集volume（包括PV、hostPath等）时会出现问题：
多个容器采集同一个volume时。其中一个容器停止或者同一个容器重启时，会将采集同一目录的所有的reader置为container stopped。但实际上这些reader正在采集其他容器的文件，后续会不断触发读取stop容器告警，产生截断。
修复方法
测试用例
新容器start，旧容器stop，文件写入modify 这三个事件之间存在时序关系。