From 874de7556567bd8ded2b1b57706dcfc48b750405 Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Thu, 8 May 2025 16:25:29 -0600 Subject: [PATCH] Don't think skipped ones should be initialized with total number. I suspect this might be the reason for failures in CrossClusterQueryWithFiltersIT --- muted-tests.yml | 3 --- .../org/elasticsearch/xpack/esql/session/EsqlCCSUtils.java | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/muted-tests.yml b/muted-tests.yml index 9f09b8a95c4a4..143117059f784 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -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: # diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/session/EsqlCCSUtils.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/session/EsqlCCSUtils.java index ccbfeaccf24a9..5e32ef5afac4a 100644 --- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/session/EsqlCCSUtils.java +++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/session/EsqlCCSUtils.java @@ -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))); }