Merge branch 'main' into none_chunking_settings

Author: jimczi

muted-tests.yml

@@ -513,6 +513,12 @@ tests:
 - class: org.elasticsearch.packaging.test.DockerTests
   method: test081SymlinksAreFollowedWithEnvironmentVariableFiles
   issue: https://github.com/elastic/elasticsearch/issues/128867
+- class: org.elasticsearch.index.engine.ThreadPoolMergeExecutorServiceDiskSpaceTests
+  method: testAvailableDiskSpaceMonitorWhenFileSystemStatErrors
+  issue: https://github.com/elastic/elasticsearch/issues/129149
+- class: org.elasticsearch.index.engine.ThreadPoolMergeExecutorServiceDiskSpaceTests
+  method: testUnavailableBudgetBlocksNewMergeTasksFromStartingExecution
+  issue: https://github.com/elastic/elasticsearch/issues/129148
 
 # Examples:
 #

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

@@ -177,13 +177,8 @@ public static void main(String[] args) throws Exception {
                     cmdLineArgs.vectorSpace(),
                     cmdLineArgs.numDocs()
                 );
-                if (Files.exists(indexPath) == false) {
-                    if (cmdLineArgs.reindex() == false) {
-                        throw new IllegalArgumentException("Index path does not exist: " + indexPath);
-                    }
-                    if (cmdLineArgs.forceMerge()) {
-                        throw new IllegalArgumentException("Force merging without an existing index in: " + indexPath);
-                    }
+                if (cmdLineArgs.reindex() == false && Files.exists(indexPath) == false) {
+                    throw new IllegalArgumentException("Index path does not exist: " + indexPath);
                 }
                 if (cmdLineArgs.reindex()) {
                     knnIndexer.createIndex(result);

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

@@ -304,7 +304,7 @@ private void readNext() throws IOException {
                 bytes.position(0);
                 // wrap around back to the start of the file if we hit the end:
                 logger.warn("VectorReader hit EOF when reading " + this.input + "; now wrapping around to start of file again");
-                this.input.position(position);
+                input.position(position);
                 bytesRead = Channels.readFromFileChannel(this.input, position, bytes);
                 if (bytesRead < bytes.capacity()) {
                     throw new IllegalStateException(

server/src/main/java/org/elasticsearch/TransportVersions.java

@@ -192,6 +192,7 @@ static TransportVersion def(int id) {
     public static final TransportVersion ESQL_REGEX_MATCH_WITH_CASE_INSENSITIVITY_8_19 = def(8_841_0_44);
     public static final TransportVersion ESQL_QUERY_PLANNING_DURATION_8_19 = def(8_841_0_45);
     public static final TransportVersion SEARCH_SOURCE_EXCLUDE_VECTORS_PARAM_8_19 = def(8_841_0_46);
+    public static final TransportVersion ML_INFERENCE_MISTRAL_CHAT_COMPLETION_ADDED_8_19 = def(8_841_0_47);
     public static final TransportVersion V_9_0_0 = def(9_000_0_09);
     public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_1 = def(9_000_0_10);
     public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_2 = def(9_000_0_11);