Skip to content

WIP: Apply skip_un to more cases #130267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
smalyshev wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

WIP: Apply skip_un to more cases #130267

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/session/EsqlCCSUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ static boolean returnSuccessWithEmptyResult(EsqlExecutionInfo executionInfo, Exc
return false;
}

// On disconnect error, check whether all remotes are marked as skip_unavailable.
if (e instanceof NoClustersToSearchException || ExceptionsHelper.isRemoteUnavailableException(e)) {
for (String clusterAlias : executionInfo.clusterAliases()) {
if (executionInfo.isSkipUnavailable(clusterAlias) == false
Expand All @@ -109,6 +110,12 @@ static boolean returnSuccessWithEmptyResult(EsqlExecutionInfo executionInfo, Exc
}
return true;
}

// If all clusters are skippable remotes, then we can return an empty result.
if (executionInfo.clusterAliases().stream().allMatch(executionInfo::isSkipUnavailable)) {
return true;
}

return false;
}

Expand Down