fix #311: RetryingChannel propagates cancelation #368
Merged
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
Generally safer by using existing utility functionality to chain futures instead of reimplementing async-transformation via callbacks.
carterkozak
commented
Feb 18, 2020
| @@ -46,61 +44,59 @@ | |||
|
|
|||
| @Override | |||
| public ListenableFuture<Response> execute(Endpoint endpoint, Request request) { | |||
| SettableFuture<Response> future = SettableFuture.create(); | |||
|
|
|||
| IntFunction<ListenableFuture<Response>> callSupplier = attempt -> { | |||
There was a problem hiding this comment.
Replaced this abstraction by passing the channel, endpoint, and request into the retryer. We still have the attempt index available for instrumentation (RetryingCallback.failures), but I find it's easier to spot bugs without the indirection.
carterkozak
commented
Feb 18, 2020
| boolean setSuccessfully = delegate.set(response); | ||
| if (!setSuccessfully) { | ||
| response.close(); | ||
| } |
There was a problem hiding this comment.
No longer have to worry about this case because cancel is propagated through the future chain.
ferozco
reviewed
Feb 18, 2020
dialogue-core/src/main/java/com/palantir/dialogue/core/RetryingChannel.java
Outdated
Show resolved
Hide resolved
| } | ||
| return Futures.immediateFailedFuture( | ||
| throwable.orElseGet(() -> new SafeRuntimeException("Retries exhausted"))); |
There was a problem hiding this comment.
It might be nice to know what caused us to retry
There was a problem hiding this comment.
good call, might as well add some helpful info logging prior to each retry while I'm here.
| } | ||
|
|
||
| private ListenableFuture<Response> wrap(ListenableFuture<Response> input) { | ||
| return Futures.catchingAsync( |
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.
Generally safer by using existing utility functionality to chain
futures instead of reimplementing async-transformation via
callbacks.
After this PR
==COMMIT_MSG==
RetryingChannel propagates cancelation
==COMMIT_MSG==