CacheBufferedIndexInput should throw EOFException #53975
Merged
Conversation
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
InputStream#read may return -1 if it reaches EOF. This is unexpected in a `CacheBufferedIndexInput` but may happen if, for instance, the underlying file is truncated. Today we don't handle this specially and an EOF can cause strange behaviour, often throwing an `ArrayIndexOutOfBoundsException`. This commit adds better handling for EOF by throwing an `EOFException`.
DaveCTurner
added
>non-issue
:Distributed Coordination/Snapshot/Restore
|
Pinging @elastic/es-distributed (:Distributed/Snapshot/Restore) |
DaveCTurner
commented
Mar 23, 2020
| throw new EOFException(String.format(Locale.ROOT, | ||
| "unexpected EOF reading [%d-%d] ([%d] bytes remaining) from %s", start, end, remaining, cacheFileReference)); | ||
| } | ||
| System.arraycopy(copyBuffer, 0, buffer, offset + bytesCopied, bytesRead); |
There was a problem hiding this comment.
Replaces len with bytesRead in case of a partial read. I think this was technically ok before since we would proceed to overwrite the junk bytes with correct ones, but it was confusing.
tlrx
approved these changes
Mar 25, 2020
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.
InputStream#readmay return -1 if it reaches EOF. This is unexpected in aCacheBufferedIndexInputbut may happen if, for instance, the underlying fileis truncated. Today we don't handle this specially and an EOF can cause strange
behaviour, often throwing an
ArrayIndexOutOfBoundsException. This commit addsbetter handling for EOF by throwing an
EOFException.