Transport level retry #954
There are no files selected for viewing
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| package co.elastic.clients.transport.rest_client; | ||
|
|
||
| import org.elasticsearch.client.Cancellable; | ||
|
|
||
| import java.util.concurrent.CompletableFuture; | ||
|
|
||
| /** | ||
| * The {@code Future} implementation returned by async requests. | ||
| * It wraps the RestClient's cancellable and propagates cancellation. | ||
| */ | ||
| public class RequestFuture<T> extends CompletableFuture<T> { | ||
| private volatile Cancellable cancellable; | ||
|
|
||
| @Override | ||
| public boolean cancel(boolean mayInterruptIfRunning) { | ||
| boolean cancelled = super.cancel(mayInterruptIfRunning); | ||
| if (cancelled && cancellable != null) { | ||
| cancellable.cancel(); | ||
| } | ||
| return cancelled; | ||
| } | ||
|
|
||
| public void setCancellable(Cancellable cancellable) { | ||
| this.cancellable = cancellable; | ||
| } | ||
| } |
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| package co.elastic.clients.transport.rest_client; | ||
|
|
||
| import co.elastic.clients.transport.BackoffPolicy; | ||
| import co.elastic.clients.transport.TransportOptions; | ||
| import co.elastic.clients.transport.http.TransportHttpClient; | ||
| import org.elasticsearch.client.ResponseException; | ||
|
|
||
| import javax.annotation.Nullable; | ||
| import java.io.IOException; | ||
| import java.util.Iterator; | ||
| import java.util.concurrent.CompletableFuture; | ||
|
|
||
| public class RetryRestClientHttpClient implements TransportHttpClient { | ||
|
|
||
| private TransportHttpClient delegate; | ||
| private BackoffPolicy backoffPolicy; | ||
|
|
||
| public RetryRestClientHttpClient(TransportHttpClient delegate, BackoffPolicy backoffPolicy) { | ||
| this.delegate = delegate; | ||
| this.backoffPolicy = backoffPolicy; | ||
| } | ||
|
|
||
| @Override | ||
| public Response performRequest(String endpointId, @Nullable Node node, Request request, | ||
| TransportOptions options) throws IOException { | ||
| return performRequestRetry(endpointId, node, request, options, backoffPolicy.iterator()); | ||
| } | ||
|
|
||
| public Response performRequestRetry(String endpointId, @Nullable Node node, Request request, | ||
|
There was a problem hiding this comment. Why do we need a separate public method? |
||
| TransportOptions options, Iterator<Long> backoffIter) throws IOException { | ||
| try { | ||
| return delegate.performRequest(endpointId, node, request, options); | ||
| } catch (ResponseException e) { | ||
| if (e.getResponse().getStatusLine().getStatusCode() == 503) { // TODO list of statuses, configurable or hardcoded? | ||
|
There was a problem hiding this comment. We should be independent of the http client here, and the fact that we have an exception with an actual response is specific to So the logic could be:
|
||
| // synchronous retry | ||
| if (backoffIter.hasNext()) { | ||
| try { | ||
| Thread.sleep(backoffIter.next()); | ||
| } catch (InterruptedException ie) { | ||
| throw e; // TODO okay with masking IE and just returning original exception? | ||
|
There was a problem hiding this comment. Yep, |
||
| } | ||
| System.out.println("Retrying"); | ||
| return performRequestRetry(endpointId, node, request, options, backoffIter); | ||
| } | ||
| } | ||
| // error not retryable | ||
| throw e; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public CompletableFuture<Response> performRequestAsync(String endpointId, @Nullable Node node, | ||
| Request request, TransportOptions options) { | ||
| RequestFuture<Response> futureResult = new RequestFuture<>(); | ||
| return performRequestAsyncRetry(endpointId, node, request, options, backoffPolicy.iterator(), | ||
| futureResult); | ||
| } | ||
|
|
||
| public CompletableFuture<Response> performRequestAsyncRetry(String endpointId, @Nullable Node node, | ||
| Request request, | ||
| TransportOptions options, | ||
| Iterator<Long> backoffIter, | ||
| CompletableFuture<Response> futureResult) { | ||
| CompletableFuture<Response> res = delegate.performRequestAsync(endpointId, node, request, options); | ||
|
|
||
| res.whenComplete((resp, e) -> { | ||
| if (e != null) { | ||
| if (e instanceof ResponseException) { | ||
| if (((ResponseException) e).getResponse().getStatusLine().getStatusCode() == 503) { // TODO list of statuses, configurable or hardcoded? | ||
| if (backoffIter.hasNext()) { | ||
| try { | ||
| Thread.sleep(backoffIter.next()); | ||
|
There was a problem hiding this comment. Avoid calling A caveat of |
||
| } catch (InterruptedException ie) { | ||
| // TODO okay with masking IE and just returning original exception? | ||
| futureResult.completeExceptionally(e); | ||
| } | ||
| System.out.println("Retrying"); | ||
| performRequestAsyncRetry(endpointId, node, request, options, backoffIter,futureResult); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| else { | ||
| futureResult.complete(resp); | ||
| } | ||
| }); | ||
|
|
||
| return futureResult; | ||
| } | ||
|
|
||
| @Override | ||
| public void close() throws IOException { | ||
| delegate.close(); | ||
| } | ||
| } | ||
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This class should be
co.elastic.transport.http.RetryingHttpClientand be independent fromorg.elasticsearch.clientso that it can be independent of the http client implementation (see also below on exception handling)