Skip to content

Feature/master/adaptive retries fixes api review#7195

Open
dagnir wants to merge 8 commits into
masterfrom
feature/master/adaptive-retries-fixes-api-review
Open

Feature/master/adaptive retries fixes api review#7195
dagnir wants to merge 8 commits into
masterfrom
feature/master/adaptive-retries-fixes-api-review

Conversation

@dagnir

@dagnir dagnir commented Jul 24, 2026

Copy link
Copy Markdown
Contributor

Motivation and Context

Modifications

Testing

Screenshots (if appropriate)

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)

Checklist

  • I have read the CONTRIBUTING document
  • Local run of mvn install succeeds
  • My code follows the code style of this project
  • My change requires a change to the Javadoc documentation
  • I have updated the Javadoc documentation accordingly
  • I have added tests to cover my changes
  • All new and existing tests passed
  • I have added a changelog entry. Adding a new entry must be accomplished by running the scripts/new-change script and following the instructions. Commit the new file created by the script in .changes/next-release with your changes.
  • My change is to implement 1.11 parity feature and I have updated LaunchChangelog

License

  • I confirm that this pull request can be released under the Apache 2 license

dagnir and others added 8 commits July 14, 2026 17:42
Add acquireInitialTokenAsync and refreshRetryTokenAsync methods to
RetryStrategy interface to better support asynchronous workflows.
* Add acquireAsync

This commit replaces tryAcquire with acquireAsync to better support
async codepaths. acquireAsync returns a CompletableFuture that is
completed when a token is successfully acquired; unlike tryAcquire, the
caller is not expected to do any of their own waiting once future is
complete.

* Additional test

* Evict cache on close

* Address comments
* Wire in acquireAsync in adaptive strat

Implement `DefaultAdaptiveRetryStrategy`'s `acquireInitialTokenAsync`
and `refreshRetryTokenAsync` using the new
`RateLimiterTokenBucket#acquireAsync`. The existing
`acquireInitialToken` and `refreshRetryToken` delegate to these new
methods.

* Review comments
Update the default *Async RetryStrategy methods that delegate to the
sync versions to catch and report any thrown errors through the returned
CompletableFuture.
 - Update AsyncRetryableStage to use the new *Async methods from
   RetryStrategy
 - Update AdaptiveRetryRateLimitingTest to test both sync and async
   clients
 - Update other tests to wait on future to avoid timing issues
If S3MetaRequestPauseObservable#pause is invoked before
S3MetaRequestPauseObservable#subscribe is executed, an NPE can occur.
This can happen if the transfer hasn't actually begin before the pause()
was invoked.

Fix this by returning `null` in this case, which `CrtFileUpload` treats
as transfer not yet started.
…feature/master/adaptive-retries-fixes-api-review
@dagnir
dagnir requested a review from a team as a code owner July 24, 2026 22:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant