honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-25 09:28:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix S3BlobContainerRetriesTests (#62464) (#62551)

Browse Source 
The AssertingInputStream in S3BlobContainerRetriesTests verifies 
that InputStream are either fully consumed or aborted, but the 
eof flag is only set when the underlying stream returns it.

When buffered read are executed and when the exact number 
of remaining bytes are read, the eof flag is not set to true. Instead 
the test should rely on the total number of bytes read to know if 
the stream has been fully consumed.

Close #62390
This commit is contained in:
Tanguy Leroux 2020-09-17 17:12:34 +02:00 committed by GitHub
parent 901000891a
commit e6777810ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3RetryingInputStream.java
View File

@ -200,7 +200,7 @@ class S3RetryingInputStream extends InputStream {
* suppressing all thrown exceptions.
*/
private void maybeAbort(S3ObjectInputStream stream) {
if (eof) {
if (isEof()) {
return;
}
try {
@ -231,7 +231,7 @@ class S3RetryingInputStream extends InputStream {
// package-private for tests
boolean isEof() {
return eof;
return eof || start + currentOffset == currentStreamLastOffset;
}
// package-private for tests