Merge remote-tracking branch 'upstream/main' into 05192025/UnpauseIndexingForPermits

Refresh

Author: ankikuma

muted-tests.yml

@@ -500,9 +500,6 @@ tests:
 - class: org.elasticsearch.test.rest.yaml.RcsCcsCommonYamlTestSuiteIT
   method: test {p0=search/600_flattened_ignore_above/flattened ignore_above multi-value field}
   issue: https://github.com/elastic/elasticsearch/issues/131967
-- class: org.elasticsearch.search.routing.SearchReplicaSelectionIT
-  method: testNodeSelection
-  issue: https://github.com/elastic/elasticsearch/issues/132017
 - class: org.elasticsearch.xpack.remotecluster.CrossClusterEsqlRCS1EnrichUnavailableRemotesIT
   method: testEsqlEnrichWithSkipUnavailable
   issue: https://github.com/elastic/elasticsearch/issues/132078
@@ -618,6 +615,7 @@ tests:
   method: "testDenseVectorMappingUpdate {initialType=int8_flat updateType=bbq_disk #2}"
   issue: https://github.com/elastic/elasticsearch/issues/132189
 
+
 # Examples:
 #
 #  Mute a single test case in a YAML test suite:

qa/multi-data-path/build.gradle

@@ -0,0 +1,10 @@
+apply plugin: 'elasticsearch.internal-yaml-rest-test'
+
+// This subproject verifies MDP continues to work with entitlements.
+
+restResources {
+  restApi {
+    include '_common', 'capabilities', 'index', 'indices', 'indices.create'
+  }
+}
+

qa/multi-data-path/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/MDPYamlTestSuiteIT.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+package org.elasticsearch.test.rest.yaml;
+
+import com.carrotsearch.randomizedtesting.annotations.Name;
+import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+
+import org.elasticsearch.test.cluster.ElasticsearchCluster;
+import org.junit.ClassRule;
+
+import java.io.IOException;
+import java.nio.file.Files;
+
+public class MDPYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
+
+    @ClassRule
+    public static ElasticsearchCluster cluster = ElasticsearchCluster.local().setting("path.shared_data", tempSharedDataPath()).build();
+
+    public MDPYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) {
+        super(testCandidate);
+    }
+
+    @ParametersFactory
+    public static Iterable<Object[]> parameters() throws Exception {
+        return createParameters();
+    }
+
+    @Override
+    protected String getTestRestCluster() {
+        return cluster.getHttpAddresses();
+    }
+
+    private static String tempSharedDataPath() {
+        try {
+            return Files.createTempDirectory("shared_data").toString();
+        } catch (IOException e) {
+            throw new AssertionError(e);
+        }
+    }
+}

qa/multi-data-path/src/yamlRestTest/resources/rest-api-spec/test/mdp/10_basic.yml

@@ -0,0 +1,31 @@
+---
+"Index using shared data path":
+
+  - requires:
+      test_runner_features: ["warnings"]
+
+  - do:
+      warnings:
+        - "[index.data_path] setting was deprecated in Elasticsearch and will be removed in a future release. See the deprecation documentation for the next major version."
+      indices.create:
+        index: test_index
+        body:
+          settings:
+            data_path: "test_index_data_path"
+
+  - do:
+      index:
+        index:  test_index
+        id:     "1"
+        body:   { foo: bar }
+
+  - match:   { result: created }
+
+  - do:
+      index:
+        index:    test_index
+        id:       "1"
+        body:     { foo: bar }
+        op_type:  index
+
+  - match:   { result: updated }

qa/vector/src/main/java/org/elasticsearch/test/knn/KnnIndexTester.java

@@ -101,7 +101,7 @@ private static String formatIndexPath(CmdLineArgs args) {
     static Codec createCodec(CmdLineArgs args) {
         final KnnVectorsFormat format;
         if (args.indexType() == IndexType.IVF) {
-            format = new IVFVectorsFormat(args.ivfClusterSize());
+            format = new IVFVectorsFormat(args.ivfClusterSize(), IVFVectorsFormat.DEFAULT_CENTROIDS_PER_PARENT_CLUSTER);
         } else {
             if (args.quantizeBits() == 1) {
                 if (args.indexType() == IndexType.FLAT) {