Merge branch 'main' into markjhoy/default_token_pruning_sparse_vector

Author: markjhoy

docs/changelog/124708.yaml

@@ -0,0 +1,5 @@
+pr: 124708
+summary: Throw exception for unknown token in RestIndexPutAliasAction
+area: Indices APIs
+type: enhancement
+issues: []

docs/changelog/124737.yaml

@@ -0,0 +1,5 @@
+pr: 124737
+summary: Throw exception for unsupported values type in Alias
+area: Indices APIs
+type: enhancement
+issues: []

qa/smoke-test-http/src/internalClusterTest/java/org/elasticsearch/http/SearchRestCancellationIT.java

@@ -12,8 +12,6 @@
 import org.apache.http.nio.entity.NByteArrayEntity;
 import org.apache.logging.log4j.LogManager;
 import org.apache.lucene.util.SetOnce;
-import org.elasticsearch.action.admin.cluster.node.info.NodeInfo;
-import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse;
 import org.elasticsearch.action.admin.cluster.node.tasks.list.ListTasksResponse;
 import org.elasticsearch.action.bulk.BulkRequestBuilder;
 import org.elasticsearch.action.search.MultiSearchRequest;
@@ -46,7 +44,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CancellationException;
@@ -94,7 +91,7 @@ public void testAutomaticCancellationMultiSearchDuringQueryPhase() throws Except
     }
 
     void verifyCancellationDuringQueryPhase(String searchAction, Request searchRequest) throws Exception {
-        Map<String, String> nodeIdToName = readNodesInfo();
+        Map<String, String> nodeIdToName = nodeIdsToNames();
 
         List<ScriptedBlockPlugin> plugins = initBlockFactory();
         indexTestData();
@@ -137,7 +134,7 @@ public void testAutomaticCancellationMultiSearchDuringFetchPhase() throws Except
     }
 
     void verifyCancellationDuringFetchPhase(String searchAction, Request searchRequest) throws Exception {
-        Map<String, String> nodeIdToName = readNodesInfo();
+        Map<String, String> nodeIdToName = nodeIdsToNames();
 
         List<ScriptedBlockPlugin> plugins = initBlockFactory();
         indexTestData();
@@ -153,16 +150,6 @@ void verifyCancellationDuringFetchPhase(String searchAction, Request searchReque
         expectThrows(CancellationException.class, future::actionGet);
     }
 
-    private static Map<String, String> readNodesInfo() {
-        Map<String, String> nodeIdToName = new HashMap<>();
-        NodesInfoResponse nodesInfoResponse = clusterAdmin().prepareNodesInfo().get();
-        assertFalse(nodesInfoResponse.hasFailures());
-        for (NodeInfo node : nodesInfoResponse.getNodes()) {
-            nodeIdToName.put(node.getNode().getId(), node.getNode().getName());
-        }
-        return nodeIdToName;
-    }
-
     private static void ensureSearchTaskIsCancelled(String transportAction, Function<String, String> nodeIdToName) throws Exception {
         SetOnce<TaskInfo> searchTask = new SetOnce<>();
         ListTasksResponse listTasksResponse = clusterAdmin().prepareListTasks().get();

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/10_basic.yml

@@ -86,6 +86,38 @@
   - is_false: test_index.aliases.test_clias.index_routing
   - is_false: test_index.aliases.test_clias.search_routing
 
+---
+  "Throw exception for unsupported value type":
+    - requires:
+        cluster_features: [ "index.throw_exception_on_index_creation_if_unsupported_value_type_in_alias" ]
+        reason: "Throw exception on index creation if unsupported value type in alias"
+
+    - do:
+        catch: /Unsupported String type value \[true\] for field \[is_write_index\] in alias \[test_alias\]/
+        indices.create:
+          index: test_index
+          body:
+            mappings:
+              properties:
+                field:
+                  type: text
+            aliases:
+              test_alias:
+                is_write_index: "true"
+
+    - do:
+        catch: /Unsupported boolean type value \[true\] for field \[routing\] in alias \[test_alias\]/
+        indices.create:
+          index: test_index
+          body:
+            mappings:
+              properties:
+                field:
+                  type: text
+            aliases:
+              test_alias:
+                routing: true
+
 ---
 "Create index with write aliases":
 

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.put_alias/10_basic.yml

@@ -103,3 +103,30 @@
         index: test_index
         name: test_alias
   - match: {test_index.aliases.test_alias: {"filter": {"range": {"date_nanos_field": {"gt": "now-7d/d"}}}}}
+
+---
+"Throw exception for unknown token":
+  - requires:
+      cluster_features: [ "index.throw_exception_for_unknown_token_in_rest_index_put_alias_action" ]
+      reason: "Throw exception for unknown token in RestIndexPutAliasAction"
+
+  - do:
+      indices.create:
+        index: test_index
+
+  - do:
+      catch: /Unsupported field \[foo\]/
+      indices.put_alias:
+        index: test_index
+        name: test_alias
+        body:
+          is_write_index: true
+          foo: "bar"
+
+  - do:
+      catch: / Unexpected token \[START_ARRAY\]/
+      indices.put_alias:
+        index: test_index
+        name: test_alias
+        body:
+          routing: [ "routing" ]

server/src/main/java/org/elasticsearch/action/admin/indices/alias/Alias.java

@@ -257,12 +257,32 @@ public static Alias fromXContent(XContentParser parser) throws IOException {
                     alias.indexRouting(parser.text());
                 } else if (SEARCH_ROUTING.match(currentFieldName, parser.getDeprecationHandler())) {
                     alias.searchRouting(parser.text());
+                } else {
+                    throw new IllegalArgumentException(
+                        "Unsupported String type value ["
+                            + parser.text()
+                            + "] for field ["
+                            + currentFieldName
+                            + "] in alias ["
+                            + alias.name
+                            + "]"
+                    );
                 }
             } else if (token == XContentParser.Token.VALUE_BOOLEAN) {
                 if (IS_WRITE_INDEX.match(currentFieldName, parser.getDeprecationHandler())) {
                     alias.writeIndex(parser.booleanValue());
                 } else if (IS_HIDDEN.match(currentFieldName, parser.getDeprecationHandler())) {
                     alias.isHidden(parser.booleanValue());
+                } else {
+                    throw new IllegalArgumentException(
+                        "Unsupported boolean type value ["
+                            + parser.text()
+                            + "] for field ["
+                            + currentFieldName
+                            + "] in alias ["
+                            + alias.name
+                            + "]"
+                    );
                 }
             } else {
                 throw new IllegalArgumentException("Unknown token [" + token + "] in alias [" + alias.name + "]");

server/src/main/java/org/elasticsearch/index/IndexFeatures.java

@@ -25,8 +25,21 @@ public Set<NodeFeature> getFeatures() {
 
     private static final NodeFeature SYNONYMS_SET_LENIENT_ON_NON_EXISTING = new NodeFeature("index.synonyms_set_lenient_on_non_existing");
 
+    private static final NodeFeature THROW_EXCEPTION_FOR_UNKNOWN_TOKEN_IN_REST_INDEX_PUT_ALIAS_ACTION = new NodeFeature(
+        "index.throw_exception_for_unknown_token_in_rest_index_put_alias_action"
+    );
+
+    private static final NodeFeature THROW_EXCEPTION_ON_INDEX_CREATION_IF_UNSUPPORTED_VALUE_TYPE_IN_ALIAS = new NodeFeature(
+        "index.throw_exception_on_index_creation_if_unsupported_value_type_in_alias"
+    );
+
     @Override
     public Set<NodeFeature> getTestFeatures() {
-        return Set.of(LOGSDB_NO_HOST_NAME_FIELD, SYNONYMS_SET_LENIENT_ON_NON_EXISTING);
+        return Set.of(
+            LOGSDB_NO_HOST_NAME_FIELD,
+            SYNONYMS_SET_LENIENT_ON_NON_EXISTING,
+            THROW_EXCEPTION_FOR_UNKNOWN_TOKEN_IN_REST_INDEX_PUT_ALIAS_ACTION,
+            THROW_EXCEPTION_ON_INDEX_CREATION_IF_UNSUPPORTED_VALUE_TYPE_IN_ALIAS
+        );
     }
 }

server/src/main/java/org/elasticsearch/index/shard/IndexShard.java

@@ -2652,7 +2652,7 @@ public void onSettingsChanged() {
     }
 
     /**
-     * Acquires a lock on the translog files and Lucene soft-deleted documents to prevent them from being trimmed
+     * Acquires a lock on Lucene soft-deleted documents to prevent them from being trimmed
      */
     public Closeable acquireHistoryRetentionLock() {
         return getEngine().acquireHistoryRetentionLock();

server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndexPutAliasAction.java

@@ -11,6 +11,7 @@
 import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest;
 import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest.AliasActions;
 import org.elasticsearch.client.internal.node.NodeClient;
+import org.elasticsearch.common.ParsingException;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
@@ -30,7 +31,6 @@
 
 @ServerlessScope(Scope.PUBLIC)
 public class RestIndexPutAliasAction extends BaseRestHandler {
-
     @Override
     public List<Route> routes() {
         return List.of(
@@ -90,11 +90,15 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
                                     searchRouting = parser.textOrNull();
                                 } else if ("is_write_index".equals(currentFieldName)) {
                                     writeIndex = parser.booleanValue();
+                                } else {
+                                    throw new IllegalArgumentException("Unsupported field [" + currentFieldName + "]");
                                 }
                     } else if (token == XContentParser.Token.START_OBJECT) {
                         if ("filter".equals(currentFieldName)) {
                             filter = parser.mapOrdered();
                         }
+                    } else if (token != XContentParser.Token.END_OBJECT) {
+                        throw new ParsingException(parser.getTokenLocation(), "Unexpected token [" + token + "]");
                     }
                 }
             }

test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java

@@ -193,6 +193,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.IdentityHashMap;
 import java.util.List;
@@ -1207,6 +1208,19 @@ public static String getNodeId(String nodeName) {
         return internalCluster().getInstance(ClusterService.class, nodeName).localNode().getId();
     }
 
+    /**
+     * @return A map of the cluster node Ids to their node names.
+     */
+    public static Map<String, String> nodeIdsToNames() {
+        var names = internalCluster().getNodeNames();
+        Map<String, String> nodeIdsToNames = new HashMap<>();
+        for (var name : names) {
+            nodeIdsToNames.put(getNodeId(name), name);
+        }
+        return nodeIdsToNames;
+
+    }
+
     /**
      * Waits until at least a give number of document is visible for searchers
      *