ShareFileClient.DownloadToFile Removing Retry.max(3) #43093
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
ibrahimrabab
requested review from
seanmcc-msft,
ibrandes,
kyleknap and
alzimmermsft
as code owners
|
API change check API changes are not detected in this pull request. |
alzimmermsft
approved these changes
Nov 26, 2024
.../test-shared/java/com/azure/storage/common/test/shared/policy/MockPartialResponsePolicy.java
Outdated
Show resolved
Hide resolved
| @Override | ||
| public Mono<HttpResponse> process(HttpPipelineCallContext context, HttpPipelineNextPolicy next) { | ||
| return next.process().flatMap(response -> { | ||
| HttpHeader rangeHttpHeader = response.getRequest().getHeaders().get(RANGE_HEADER); |
There was a problem hiding this comment.
Are we always guaranteed for consumers of this to use x-ms-range as the range header? If not, in the future when needed this could be modified to include a header in the constructor to determine which header to look for.
kyleknap
reviewed
Nov 26, 2024
...torage/azure-storage-file-share/src/test/java/com/azure/storage/file/share/FileApiTests.java
Outdated
Show resolved
Hide resolved
...torage/azure-storage-file-share/src/test/java/com/azure/storage/file/share/FileApiTests.java
Show resolved
Hide resolved
.../test-shared/java/com/azure/storage/common/test/shared/policy/MockPartialResponsePolicy.java
Outdated
Show resolved
Hide resolved
.../test-shared/java/com/azure/storage/common/test/shared/policy/MockPartialResponsePolicy.java
Outdated
Show resolved
Hide resolved
...torage/azure-storage-file-share/src/test/java/com/azure/storage/file/share/FileApiTests.java
Outdated
Show resolved
Hide resolved
...zure-storage-file-share/src/main/java/com/azure/storage/file/share/ShareFileAsyncClient.java
Show resolved
Hide resolved
...e/azure-storage-file-share/src/test/java/com/azure/storage/file/share/FileAsyncApiTests.java
Outdated
Show resolved
Hide resolved
kyleknap
reviewed
Nov 28, 2024
| @@ -7,6 +7,7 @@ | |||
| ### Breaking Changes | |||
|
|
|||
| ### Bugs Fixed | |||
| - `ShareFileClient.downloadToFile()` now retries for a maximum of 5 times when the download fails due to a network error. | |||
There was a problem hiding this comment.
Let's also include what the previous maximum (15) and note both that the number of reties was unintentional and that the additional retires past the intended maximum of 5 could lead to writing in incorrect positions in the file.
...torage/azure-storage-file-share/src/test/java/com/azure/storage/file/share/FileApiTests.java
Outdated
Show resolved
Hide resolved
kyleknap
reviewed
Nov 28, 2024
| // Assert that the range headers that were retried match what was returned from MockPartialResponsePolicy | ||
| List<String> expectedRanges = expectedHeaderRanges(); | ||
| List<String> actualRanges = policy.getRangeHeaders(); | ||
| assertEquals(expectedRanges.size(), actualRanges.size()); |
There was a problem hiding this comment.
We should be able to remove the size assertion here and defer to the direct equals assertion of the two lists for these test cases so just:
assertEquals(expectedRanges, actualRanges);| List<String> expectedRanges = expectedHeaderRanges(); | ||
| List<String> actualRanges = policy.getRangeHeaders(); | ||
| assertEquals(expectedRanges.size(), actualRanges.size()); | ||
|
|
There was a problem hiding this comment.
I think we forgot to add the assertEquals here for the two lists
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.
Description
Removing extra outer retries in downloadToFile as this was causing a mismatch in bytes downloaded when inner retries from downloadWithResponse's FluxUtil.createRetriableDownloadFlux were exhausted.