ensure that indices are ordered consistently when extracted from a PI…

…T. Removes the indices from transform pit search requests.
jimczi · Dec 7, 2023 · c2388ec · c2388ec
1 parent 99c9efa
commit c2388ec
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/server/src/main/java/org/elasticsearch/action/search/SearchContextId.java b/server/src/main/java/org/elasticsearch/action/search/SearchContextId.java
@@ -32,10 +32,10 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 public final class SearchContextId {
@@ -132,7 +132,8 @@ private static void readShardsMapEntry(StreamInput in, Map<ShardId, SearchContex
     }
 
     public String[] getActualIndices() {
-        final Set<String> indices = new HashSet<>();
+        // ensure that the order is consistent
+        final Set<String> indices = new TreeSet<>();
         for (Map.Entry<ShardId, SearchContextIdForNode> entry : shards().entrySet()) {
             final String indexName = entry.getKey().getIndexName();
             final String clusterAlias = entry.getValue().getClusterAlias();

diff --git a/...rm/src/main/java/org/elasticsearch/xpack/transform/transforms/ClientTransformIndexer.java b/...rm/src/main/java/org/elasticsearch/xpack/transform/transforms/ClientTransformIndexer.java
@@ -529,6 +529,10 @@ void doSearch(Tuple<String, SearchRequest> namedSearchRequest, ActionListener<Se
         logger.trace("searchRequest: [{}]", searchRequest);
 
         PointInTimeBuilder pit = searchRequest.pointInTimeBuilder();
+        if (pit != null) {
+            // remove the indices from the request, they will be derived from the provided pit
+            searchRequest = new SearchRequest(searchRequest).indices(new String[0]);
+        }
 
         ClientHelper.executeWithHeadersAsync(
             transformConfig.getHeaders(),