[pkg/stanza] Stop readerFactory from returning an error when creating an unsafeReader #12767
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
… an unsafeReader Because the unsafeReader is not linked to any file, it caused an error when the readerBuilder tried to set its offset to the end of the file. Because the unsafeReader is later initialized with other data, we can simply ignore setting the offset here, because it will be overwritten anyway.
djaglowski
approved these changes
Jul 28, 2022
There was a problem hiding this comment.
Thank you for reporting this and submitting the fix as well.
I would like to rework the implementation, but this issue is urgent. I've manually verified the issue and tested the fix, so I will merge this now and submit a follow up PR with this suggestion and some test cases.
Comment on lines
+131
to
+132
| // unsafeReader has the file set to nil, so don't try emending its offset. | ||
| if !b.fromBeginning && !b.isUnsafe { |
There was a problem hiding this comment.
Technically, we don't need the additional variable and associated code, and could just move this block into the if b.file != nil condition above. I think the comment you've added would be sufficient to explain why it is located there.
6 tasks
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.
Description:
The method
unsafeReader()of thereaderBuilderno longer returns errors when the parameterisBeginningis set tofalse. This caused thefilelogreceiver to crash when the collector was restarted and the parameterstart_atwas set toend(which was also the default value).Link to tracking Issue:
Fixes #12766
Testing:
Manual testing against the test data mentioned in the issue.