Skip to content

Commit 1d5ea93

Browse files
fix: gal countdown and prevent error bubbling up
1 parent a5263d0 commit 1d5ea93

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

server/src/main/java/org/elasticsearch/action/admin/indices/resolve/ResolveIndexAction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,7 @@ protected void doExecute(Task task, Request request, final ActionListener<Respon
684684

685685
connectionListener.addListener(gal.delegateResponse((l, failure) -> {
686686
logger.info("failed to resolve indices on remote cluster [" + clusterAlias + "]", failure);
687-
l.onFailure(failure);
687+
l.onResponse(null);
688688
})
689689
.delegateFailure(
690690
(ignored, connection) -> transportService.sendRequest(
@@ -694,7 +694,7 @@ protected void doExecute(Task task, Request request, final ActionListener<Respon
694694
TransportRequestOptions.EMPTY,
695695
new ActionListenerResponseHandler<>(gal.delegateResponse((l, failure) -> {
696696
logger.info("Error occurred on remote cluster [" + clusterAlias + "]", failure);
697-
l.onFailure(failure);
697+
l.onResponse(null);
698698
}).map(resolveIndexResponse -> Map.entry(clusterAlias, resolveIndexResponse)),
699699
Response::new,
700700
EsExecutors.DIRECT_EXECUTOR_SERVICE

0 commit comments

Comments
 (0)