Skip to content

Commit 814101f

Browse files
Rename references to skip_unavailable
1 parent 6586215 commit 814101f

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

server/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1025,7 +1025,7 @@ protected void releaseResponse(SearchResponse searchResponse) {
10251025
}
10261026

10271027
/**
1028-
* Creates a new Cluster object using the {@link ShardSearchFailure} info and skip_unavailable
1028+
* Creates a new Cluster object using the {@link ShardSearchFailure} info and shouldSkipOnFailure
10291029
* flag to set Status. Then it swaps it in the clusters CHM at key clusterAlias
10301030
*/
10311031
static void ccsClusterInfoUpdate(
@@ -1063,8 +1063,8 @@ private static void ccsClusterInfoUpdate(
10631063
) {
10641064
/*
10651065
* Cluster Status logic:
1066-
* 1) FAILED if total_shards > 0 && all shards failed && skip_unavailable=false
1067-
* 2) SKIPPED if total_shards > 0 && all shards failed && skip_unavailable=true
1066+
* 1) FAILED if total_shards > 0 && all shards failed && shouldSkipOnFailure=false
1067+
* 2) SKIPPED if total_shards > 0 && all shards failed && shouldSkipOnFailure=true
10681068
* 3) PARTIAL if it timed out
10691069
* 4) PARTIAL if it at least one of the shards succeeded but not all
10701070
* 5) SUCCESSFUL if no shards failed (and did not time out)
@@ -1862,7 +1862,7 @@ protected void releaseResponse(FinalResponse response) {}
18621862
* causes of shard failures.
18631863
* @param f ShardSearchFailure to log
18641864
* @param clusterAlias cluster on which the failure occurred
1865-
* @param shouldSkipOnFailure the skip_unavailable setting of the cluster with the search error
1865+
* @param shouldSkipOnFailure the shouldSkipOnFailure setting of the cluster with the search error
18661866
*/
18671867
private static void logCCSError(ShardSearchFailure f, String clusterAlias, boolean shouldSkipOnFailure) {
18681868
String errorInfo;
@@ -1873,7 +1873,7 @@ private static void logCCSError(ShardSearchFailure f, String clusterAlias, boole
18731873
errorInfo = f.toString();
18741874
}
18751875
logger.debug(
1876-
"CCS remote cluster failure. Cluster [{}]. skip_unavailable: [{}]. Error: {}",
1876+
"CCS remote cluster failure. Cluster [{}]. shouldSkipOnFailure: [{}]. Error: {}",
18771877
clusterAlias,
18781878
shouldSkipOnFailure,
18791879
errorInfo

0 commit comments

Comments
 (0)