Skip to content

Commit c0da700

Browse files
EQL: Fix CPS index options for PIT (elastic#138800)
1 parent 8d9587c commit c0da700

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/execution/search/BasicQueryClient.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ protected void search(SearchRequest search, boolean allowPartialSearchResults, A
7676
log.trace("About to execute query {} on {}", StringUtils.toString(search.source()), indices);
7777
}
7878

79-
if (cfg.crossProjectEnabled()) {
79+
// PIT contains the options already, and _search won't accept them a second time
80+
if (usingPit() == false && cfg.crossProjectEnabled()) {
8081
search.indicesOptions(CrossProjectIndexResolutionValidator.indicesOptionsForCrossProjectFanout(search.indicesOptions()));
8182
}
8283
client.search(search, listener);
@@ -95,7 +96,8 @@ protected void search(MultiSearchRequest search, boolean allowPartialSearchResul
9596
}
9697
log.trace("About to execute multi-queries {} on {}", sj, indices);
9798
}
98-
if (cfg.crossProjectEnabled()) {
99+
// PIT contains the options already, and _search won't accept them a second time
100+
if (usingPit() == false && cfg.crossProjectEnabled()) {
99101
search.indicesOptions(CrossProjectIndexResolutionValidator.indicesOptionsForCrossProjectFanout(search.indicesOptions()));
100102
}
101103
client.multiSearch(search, multiSearchLogListener(listener, allowPartialSearchResults, log));
@@ -196,4 +198,8 @@ public void multiQuery(List<SearchRequest> searches, ActionListener<MultiSearchR
196198
}
197199
search(multiSearchBuilder.request(), allowPartialSearchResults, listener);
198200
}
201+
202+
protected boolean usingPit() {
203+
return false;
204+
}
199205
}

x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/execution/search/PITAwareQueryClient.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,4 +165,9 @@ public void close(ActionListener<Boolean> listener) {
165165
pitId = null;
166166
}
167167
}
168+
169+
@Override
170+
protected boolean usingPit() {
171+
return true;
172+
}
168173
}

0 commit comments

Comments
 (0)