Skip to content

Don't think skipped ones should be initialized with total number #127944

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

Merged
merged 2 commits into from
May 9, 2025
Merged

Don't think skipped ones should be initialized with total number #127944

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
874de75
Don't think skipped ones should be initialized with total number.
smalyshev May 8, 2025
5e83d03
Merge branch 'main' into fix-setting-shards
smalyshev May 9, 2025
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
3 changes: 0 additions & 3 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,9 +462,6 @@ tests:
- class: org.elasticsearch.cluster.routing.allocation.decider.DiskThresholdDeciderIT
method: testRestoreSnapshotAllocationDoesNotExceedWatermarkWithMultipleRestores
issue: https://github.com/elastic/elasticsearch/issues/127787
- class: org.elasticsearch.xpack.esql.action.CrossClusterQueryWithFiltersIT
method: testTimestampFilterFromQuery
issue: https://github.com/elastic/elasticsearch/issues/127332

# Examples:
#
Expand Down
6 changes: 3 additions & 3 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 @@ -350,9 +350,9 @@ public static void markClusterWithFinalStateAndNoShards(
Cluster.Builder builder = new Cluster.Builder(v).setStatus(status)
.setTook(executionInfo.tookSoFar())
.setTotalShards(Objects.requireNonNullElse(v.getTotalShards(), 0))
.setSuccessfulShards(Objects.requireNonNullElse(v.getTotalShards(), 0))
.setSkippedShards(Objects.requireNonNullElse(v.getTotalShards(), 0))
.setFailedShards(Objects.requireNonNullElse(v.getTotalShards(), 0));
.setSuccessfulShards(Objects.requireNonNullElse(v.getSuccessfulShards(), 0))
.setSkippedShards(Objects.requireNonNullElse(v.getSkippedShards(), 0))
.setFailedShards(Objects.requireNonNullElse(v.getFailedShards(), 0));
if (ex != null) {
builder.setFailures(List.of(new ShardSearchFailure(ex)));
}
Expand Down