Skip to content

Commit dbc24be

Browse files
smalyshevjfreden
authored andcommitted
Don't think skipped ones should be initialized with total number. (elastic#127944)
I suspect this might be the reason for failures in CrossClusterQueryWithFiltersIT
1 parent 2578053 commit dbc24be

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

muted-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -453,9 +453,6 @@ tests:
453453
- class: org.elasticsearch.cluster.routing.allocation.decider.DiskThresholdDeciderIT
454454
method: testRestoreSnapshotAllocationDoesNotExceedWatermarkWithMultipleRestores
455455
issue: https://github.com/elastic/elasticsearch/issues/127787
456-
- class: org.elasticsearch.xpack.esql.action.CrossClusterQueryWithFiltersIT
457-
method: testTimestampFilterFromQuery
458-
issue: https://github.com/elastic/elasticsearch/issues/127332
459456
- class: org.elasticsearch.indices.stats.IndexStatsIT
460457
method: testThrottleStats
461458
issue: https://github.com/elastic/elasticsearch/issues/126359

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -350,9 +350,9 @@ public static void markClusterWithFinalStateAndNoShards(
350350
Cluster.Builder builder = new Cluster.Builder(v).setStatus(status)
351351
.setTook(executionInfo.tookSoFar())
352352
.setTotalShards(Objects.requireNonNullElse(v.getTotalShards(), 0))
353-
.setSuccessfulShards(Objects.requireNonNullElse(v.getTotalShards(), 0))
354-
.setSkippedShards(Objects.requireNonNullElse(v.getTotalShards(), 0))
355-
.setFailedShards(Objects.requireNonNullElse(v.getTotalShards(), 0));
353+
.setSuccessfulShards(Objects.requireNonNullElse(v.getSuccessfulShards(), 0))
354+
.setSkippedShards(Objects.requireNonNullElse(v.getSkippedShards(), 0))
355+
.setFailedShards(Objects.requireNonNullElse(v.getFailedShards(), 0));
356356
if (ex != null) {
357357
builder.setFailures(List.of(new ShardSearchFailure(ex)));
358358
}

0 commit comments

Comments
 (0)