Skip to content

Commit 6254827

Browse files
Fix build
1 parent 30fd5be commit 6254827

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/enrich/EnrichPolicyResolver.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ public void onFailure(Exception e) {
347347
}
348348

349349
private void failIfSkipUnavailableFalse(Exception e, String cluster, ActionListener<LookupResponse> lookupListener) {
350-
if (ExceptionsHelper.isRemoteUnavailableException(e) && remoteClusterService.isSkipUnavailable(cluster)) {
350+
if (ExceptionsHelper.isRemoteUnavailableException(e) && remoteClusterService.isSkipUnavailable(cluster).orElse(true)) {
351351
lookupListener.onResponse(new LookupResponse(e));
352352
} else {
353353
lookupListener.onFailure(e);
@@ -465,7 +465,7 @@ protected Map<String, EnrichPolicy> availablePolicies() {
465465
protected void getRemoteConnection(String cluster, ActionListener<Transport.Connection> listener) {
466466
remoteClusterService.maybeEnsureConnectedAndGetConnection(
467467
cluster,
468-
remoteClusterService.isSkipUnavailable(cluster) == false,
468+
remoteClusterService.isSkipUnavailable(cluster).orElse(true) == false,
469469
listener
470470
);
471471
}

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/TransportEsqlQueryAction.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,10 @@ private EsqlExecutionInfo getOrCreateExecutionInfo(Task task, EsqlQueryRequest r
333333
}
334334

335335
private EsqlExecutionInfo createEsqlExecutionInfo(EsqlQueryRequest request) {
336-
return new EsqlExecutionInfo(clusterAlias -> remoteClusterService.isSkipUnavailable(clusterAlias), request.includeCCSMetadata());
336+
return new EsqlExecutionInfo(
337+
clusterAlias -> remoteClusterService.isSkipUnavailable(clusterAlias).orElse(true),
338+
request.includeCCSMetadata()
339+
);
337340
}
338341

339342
private EsqlQueryResponse toResponse(Task task, EsqlQueryRequest request, Configuration configuration, Result result) {

0 commit comments

Comments
 (0)