layerStore.Diff(): don't add an unnecessary buffer #1087
Merged
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
|
LGTM, if this works. Is this something we should test against buildah before we merge? |
|
Changes LGTM, tests do not. A test with Buildah would be good. |
nalind
force-pushed
the
redundant-readall
branch
from
e73e9a7
to
ccf6e36
Compare
Don't ReadAll() from a Reader to create a buffer and then create another Reader to read from that buffer. Don't close a file and a decompressor that we're using to read the file's contents when we we may still need to read from them after the current function returns. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
nalind
force-pushed
the
redundant-readall
branch
from
ccf6e36
to
e5ea934
Compare
|
We were potentially closing the underlying file and the pgzip decompression filter before the JSON decoder had finished reading from the decompression filter, and that appears to have created a hang when we stopped buffering up all of the file's contents at the first step. The JSON decoder and pgzip decompressor are both advertised as potentially reading more information than they strictly require if there's some available, so I'm guessing that a partial read left one or the other waiting for more information that would never come. |
|
LGTM |
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.
Don't
ReadAll()from aReaderto create a buffer and then create anotherReaderto read from that buffer.