Cherry-pick #22685 to 7.x: Properly update offset in case of unparasable line#24885
Merged
ChrsMark merged 2 commits intoelastic:7.xfrom Apr 1, 2021
Merged
Cherry-pick #22685 to 7.x: Properly update offset in case of unparasable line#24885ChrsMark merged 2 commits intoelastic:7.xfrom
ChrsMark merged 2 commits intoelastic:7.xfrom
Conversation
(cherry picked from commit 655984e)
Contributor
|
Pinging @elastic/integrations (Team:Platforms) |
Contributor
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
Trends 🧪💚 Flaky test reportTests succeeded. Expand to view the summary
Test stats 🧪
|
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Cherry-pick of PR #22685 to 7.x branch. Original message:
What does this PR do?
This PR adds a fix for cases of
dockerreader meets an unparsable line and skips it (introduced at #12268). In such cases we should properly update the offset by adding the skipped bytes so as to point to the right byte.Why is it important?
Having a wrong offset in the registry will make harvester start from the wrong offset in case of Filebeat's restarts or reopened files which will lead to another
ErrLineUnparsable. Offset will never be healed from now on.Testing notes
make python-envsource ./build/python-env/bin/activatemake filebeat.testpytest tests/system/test_container.py