Tar reader stuck with certain files and chunk sizes #2698
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
Cannot share repeating tar files but when reading certain tar files the stage would get stuck waiting for more data to be pushed but without having pulled upstream to actually get the next chunk.
johanandren
force-pushed
the
wip-2697-tar-reader-stuck-johanandren
branch
from
a5471cc
to
62a9d9b
Compare
johanandren
commented
Jul 2, 2021
| @@ -37,12 +36,15 @@ private[file] class TarReaderStage | |||
| extends SubSourceOutlet[ByteString]("fileOut") | |||
| with TarReaderStage.SourceWithTimeout | |||
|
|
|||
| readHeader(ByteString.empty) | |||
| setHandlers(flowIn, flowOut, new CollectHeader(ByteString.empty)) | |||
There was a problem hiding this comment.
We can't do a pull in the constructor, only set handlers, so instead of calling readHeader we set collect handlers here directly, we anyway know the buffer is empty.
|
|
||
| def readHeader(buffer: ByteString): Unit = { | ||
| if (buffer.length >= TarArchiveEntry.headerLength) { | ||
| readFile(buffer) | ||
| } else setHandlers(flowIn, flowOut, new CollectHeader(buffer)) | ||
| } else { | ||
| if (!hasBeenPulled(flowIn)) pull(flowIn) |
There was a problem hiding this comment.
For the problematic files/chunk size scenario we'd get here, without flowIn being pulled, and then switch to CollectHeader waiting to get the next chunk.
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.
Cannot share repeating tar files (from customer) and did not figure out how to create a repeating file safe to share, but when reading certain tar files the stage would get stuck waiting for more data to be pushed but without having pulled upstream to actually get the next chunk.
References #2697