fix: retrying get remote offset and recover from last chunk failures.#726
Merged
gcf-merge-on-green[bot] merged 7 commits intomasterfrom Feb 26, 2021
Merged
fix: retrying get remote offset and recover from last chunk failures.#726gcf-merge-on-green[bot] merged 7 commits intomasterfrom
gcf-merge-on-green[bot] merged 7 commits intomasterfrom
Conversation
Codecov Report
@@ Coverage Diff @@
## master #726 +/- ##
============================================
+ Coverage 64.33% 64.60% +0.26%
- Complexity 621 634 +13
============================================
Files 32 32
Lines 5322 5311 -11
Branches 521 519 -2
============================================
+ Hits 3424 3431 +7
+ Misses 1733 1718 -15
+ Partials 165 162 -3
Continue to review full report at Codecov.
|
BenWhitehead
approved these changes
Feb 24, 2021
Collaborator
BenWhitehead
left a comment
There was a problem hiding this comment.
Just a few minor comments/questions
| } | ||
|
|
||
| @Test | ||
| public void testWriteWithDriftRetryCase10() throws IOException { |
Collaborator
There was a problem hiding this comment.
nit: I don't know what case N is,
If easy can we improve these test names? maybe something like
testWriteWithDriftRetry_exceptionWhileWriting
| response = httpRequest.execute(); | ||
| int code = response.getStatusCode(); | ||
| if (code == 201 || code == 200) { | ||
| // Upload completed successfully |
Collaborator
There was a problem hiding this comment.
nit: create constants for compared values instead of commenting
201 -> STATUS_CREATED
200 -> STATUS_OK
| sb.append("Not sure what occurred. Here's debugging information:\n"); | ||
| sb.append("Response:\n").append(ex.toString()).append("\n\n"); | ||
| throw new StorageException(0, sb.toString()); | ||
| throw translate(ex); |
Collaborator
There was a problem hiding this comment.
We don't want to keep the information in the exception message?
| sb.append("uploadId: ").append(getUploadId()).append('\n'); | ||
| sb.append("localNextByteOffset: ").append(localNextByteOffset).append('\n'); | ||
| sb.append("remoteNextByteOffset: ").append(remoteNextByteOffset).append('\n'); | ||
| sb.append("driftOffset: ").append(driftOffset).append("\n\n"); |
Collaborator
There was a problem hiding this comment.
nit: only diff between this block and case 4 is Local vs Remote can we extract a method of this logic so it's easier to keep in sync?
gcf-merge-on-green bot
pushed a commit
that referenced
this pull request
Mar 1, 2021
🤖 I have created a release \*beep\* \*boop\* --- ### [1.113.12](https://www.github.com/googleapis/java-storage/compare/v1.113.11...v1.113.12) (2021-02-26) ### Bug Fixes * retrying get remote offset and recover from last chunk failures. ([#726](https://www.github.com/googleapis/java-storage/issues/726)) ([b41b881](https://www.github.com/googleapis/java-storage/commit/b41b88109e13b5ebbd0393d1f264225c12876be6)) ### Dependencies * update dependency com.google.api-client:google-api-client to v1.31.2 ([#686](https://www.github.com/googleapis/java-storage/issues/686)) ([6b1f036](https://www.github.com/googleapis/java-storage/commit/6b1f0361376167719ec5456181134136d27d1d3c)) * update dependency com.google.cloud:google-cloud-shared-dependencies to v0.20.0 ([#732](https://www.github.com/googleapis/java-storage/issues/732)) ([c98413d](https://www.github.com/googleapis/java-storage/commit/c98413df9d9514340aed78b5a4d5e596760bb616)) * update kms.version to v0.87.7 ([#724](https://www.github.com/googleapis/java-storage/issues/724)) ([3229bd8](https://www.github.com/googleapis/java-storage/commit/3229bd860f3a4d700a969aa9e922bbf6b5c1ca10)) * update kms.version to v0.87.8 ([#733](https://www.github.com/googleapis/java-storage/issues/733)) ([a21b75f](https://www.github.com/googleapis/java-storage/commit/a21b75fa846f373970298dd98f8f3520fc2b3c97)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
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.
Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly:
I added three things in this PR:
Fixes #709 #687 ☕️