[20.10 backport] Fix handling for json-file io.UnexpectedEOF #42174
Merged
thaJeztah merged 2 commits intoMar 20, 2021
Merged
Conversation
When the multireader hits EOF, we will always get EOF from it, so we cannot store the multrireader fro later error handling, only for the decoder. Thanks @tobiasstadler for pointing this error out. Signed-off-by: Brian Goff <[email protected]> (cherry picked from commit 4be98a3) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Tonis mentioned that we can run into issues if there is more error handling added here. This adds a custom reader implementation which is like io.MultiReader except it does not cache EOF's. What got us into trouble in the first place is `io.MultiReader` will always return EOF once it has received an EOF, however the error handling that we are going for is to recover from an EOF because the underlying file is a file which can have more data added to it after EOF. Signed-off-by: Brian Goff <[email protected]> (cherry picked from commit 5a664dc) Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah
added
area/logging
status/2-code-review
impact/changelog
kind/bugfix
Member
Author
|
@cpuguy83 @tonistiigi ptal |
tonistiigi
approved these changes
Mar 19, 2021
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
3 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.
backport of #42104
Before this, we essentially end up doubling any buffered data from the
json decoder by storing it in both
d.decandd.rdr.Thanks @tobiasstadler for pointing this error out.
Fixes #41820
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)