Fix adaptive retries implementation - #7197
Merged
Merged
Conversation
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.
…tive-retries-fixes
…tive-retries-fixes
* Update AsyncRetryableStage + tests - 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 * Review fixes - Remove commented sleep - Ensure CompletionException is unwrapped - Log non-zero backoff duration * Return instead of falling thru
dagnir
added
the
api-surface-area-approved-by-team
* Avoid unnecessary schedule * Fix unnecessary stubbing error * Additional unnecessary stubbing fixes
RanVaknin
reviewed
Aug 10, 2026
| verify(scheduler).schedule(any(Runnable.class), anyLong(), any(TimeUnit.class)); | ||
| } | ||
|
|
||
|
|
Contributor
There was a problem hiding this comment.
non blocking nit:
We don't have a unit test that explicitly tests the happy path:
The integ tests asserts the overall behavior but we probably should have a unit test that verifies that the future is completed successfully, and that capacity was consumed.
Contributor
Author
There was a problem hiding this comment.
Sure will follow up with a PR to add a test.
RanVaknin
approved these changes
Aug 10, 2026
Contributor
Author
|
Waiting for #7248 to get into |
JackPGreen
pushed a commit
to JackPGreen/aws-sdk-java-v2
that referenced
this pull request
Aug 11, 2026
Bump version to 2.52.0 in preparation for releasing the adaptive retries fixes (aws#7197).
|
This pull request has been closed and the conversation has been locked. Comments on closed PRs are hard for our team to see. If you need more assistance, please open a new issue that references this one. |
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Motivation and Context
This is merging the feature branch
feature/master/adaptive-retries-fixestomaster. The branch fixes the implementation theAdaptiveRetryStrategyto correctly rate limit the client requests under throttling conditions; previously this rate limit was too aggressive (could result in TPS much lower than server TPS), and unstable (rate limited TPS varies over time, even if the server TPS is static).This branch is a collection of smaller PR's that have been reviewed previously:
Modifications
Testing
Screenshots (if appropriate)
Types of changes
Checklist
mvn installsucceedsscripts/new-changescript and following the instructions. Commit the new file created by the script in.changes/next-releasewith your changes.License