Skip to content

Commit 7a350a8

Browse files
committed
fix enrich targets
1 parent 16fe6ae commit 7a350a8

File tree

1 file changed

+5
-1
lines changed
  • x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/session

1 file changed

+5
-1
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.elasticsearch.indices.IndicesExpressionGrouper;
2424
import org.elasticsearch.logging.LogManager;
2525
import org.elasticsearch.logging.Logger;
26+
import org.elasticsearch.transport.RemoteClusterAware;
2627
import org.elasticsearch.xpack.esql.VerificationException;
2728
import org.elasticsearch.xpack.esql.action.EsqlExecutionInfo;
2829
import org.elasticsearch.xpack.esql.action.EsqlQueryRequest;
@@ -81,6 +82,7 @@
8182

8283
import java.util.ArrayList;
8384
import java.util.HashMap;
85+
import java.util.HashSet;
8486
import java.util.Iterator;
8587
import java.util.List;
8688
import java.util.Map;
@@ -361,7 +363,9 @@ public void analyzedPlan(
361363
EsqlCCSUtils.checkForCcsLicense(executionInfo, indices, indicesExpressionGrouper, configuredClusters, verifier.licenseState());
362364
initializeClusterData(indices, executionInfo);
363365

364-
final Set<String> targetClusters = executionInfo.getClusters().keySet();
366+
Set<String> targetClusters = new HashSet<>(executionInfo.getClusters().keySet());
367+
// Always include local cluster for enrich resolution
368+
targetClusters.add(RemoteClusterAware.LOCAL_CLUSTER_GROUP_KEY);
365369

366370
var listener = SubscribableListener.<EnrichResolution>newForked(
367371
l -> enrichPolicyResolver.resolvePolicies(targetClusters, unresolvedPolicies, executionInfo, l)

0 commit comments

Comments
 (0)