fix: update request method of HttpStorageRpc to properly configure offset on requests#1434
Merged
BenWhitehead merged 2 commits intomainfrom Jun 8, 2022
Merged
fix: update request method of HttpStorageRpc to properly configure offset on requests#1434BenWhitehead merged 2 commits intomainfrom
BenWhitehead merged 2 commits intomainfrom
Conversation
frankyn
suggested changes
Jun 6, 2022
...e-cloud-storage/src/test/java/com/google/cloud/storage/DefaultRetryHandlingBehaviorTest.java
Outdated
Show resolved
Hide resolved
| mediaHttpDownloader.setBytesDownloaded(position); | ||
| mediaHttpDownloader.setDirectDownloadEnabled(true); | ||
| req.executeMediaAndDownloadTo(outputStream); | ||
| return mediaHttpDownloader.getNumBytesDownloaded(); |
Contributor
There was a problem hiding this comment.
Is this a refactor or is there magical Apiary functionality hidden in this?
Collaborator
Author
There was a problem hiding this comment.
There seems to be magical apiary behavior behind this. The previous code wouldn't set the Range header ever, but the new code does.
I don't fully understand what's the subtle difference between req.executeMedia().download(os) and req.executeMediaAndDownloadTo(os) but the latter results in the Range header being set if position > 0.
Collaborator
Author
There was a problem hiding this comment.
I have since moved away from the previous executeAndDownload method change. This was not properly respecting returnRawInputStream which would break gzip automatic transcoding if you wanted to actually download the zipped bytes. Instead, we are now setting the range header ourselves.
frankyn
approved these changes
Jun 7, 2022
…fset on requests When invoking downloadTo(..., OutputStream) if a retry was attempted the proper byte offset was not being sent in the retried request. Update logic of HttpStorageRpc.read to manually set the range header rather than trying to rely on MediaDownloader to do it along with not automatically decompressing the byte stream. Update ITRetryConformanceTest to run Scenario 8 test cases, which cover resuming a download which could have caught this error sooner. Update StorageException.translate(IOException) to classify `IOException: Premature EOF` as the existing retryable reason `connectionClosedPrematurely`. Add case to DefaultRetryHandlingBehaviorTest to ensure conformance to this categorization. Break downloadTo integration test out into their own class, and separate the multiple scenarios being tested in the same method. Related to #1425
4c21e20 to
0f2ef8a
Compare
frankyn
approved these changes
Jun 8, 2022
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
2 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.
When invoking downloadTo(..., OutputStream) if a retry was attempted the proper byte
offset was not being sent in the retried request. Update logic of HttpStorageRpc.read
to manually set the range header rather than trying to rely on MediaDownloader to do
it along with not automatically decompressing the byte stream.
Update ITRetryConformanceTest to run Scenario 8 test cases, which cover resuming a
download which could have caught this error sooner.
Update StorageException.translate(IOException) to classify
IOException: Premature EOFas the existing retryable reason
connectionClosedPrematurely. Add case toDefaultRetryHandlingBehaviorTest to ensure conformance to this categorization.
Break downloadTo integration test out into their own class, and separate
the multiple scenarios being tested in the same method.
Related to #1425