Merge branch 'main' into failure-store-data-and-failures-privileges

Author: n1v0lg

CONTRIBUTING.md

@@ -467,7 +467,7 @@ expensive messages that will usually be discarded:
 
 Logging is an important behaviour of the system and sometimes deserves its own
 unit tests, especially if there is complex logic for computing what is logged
-and when to log it. You can use a `org.elasticsearch.test.MockLogAppender` to
+and when to log it. You can use a `org.elasticsearch.test.MockLog` to
 make assertions about the logs that are being emitted.
 
 Logging is a powerful diagnostic technique, but it is not the only possibility.

docs/changelog/125477.yaml

@@ -0,0 +1,6 @@
+pr: 125477
+summary: Prevent get datafeeds stats API returning an error when local tasks are slow to stop
+area: Machine Learning
+type: bug
+issues:
+  - 104160

muted-tests.yml

@@ -395,6 +395,9 @@ tests:
 - class: org.elasticsearch.packaging.test.DockerTests
   method: test021InstallPlugin
   issue: https://github.com/elastic/elasticsearch/issues/116147
+- class: org.elasticsearch.action.RejectionActionIT
+  method: testSimulatedSearchRejectionLoad
+  issue: https://github.com/elastic/elasticsearch/issues/125901
 
 # Examples:
 #

server/src/main/java/org/elasticsearch/inference/InferenceServiceResults.java

@@ -24,25 +24,12 @@ public interface InferenceServiceResults extends NamedWriteable, ChunkedToXConte
 
     /**
      * <p>Transform the result to match the format required for the TransportCoordinatedInferenceAction.
-     * For the inference plugin TextEmbeddingResults, the {@link #transformToLegacyFormat()} transforms the
-     * results into an intermediate format only used by the plugin's return value. It doesn't align with what the
-     * TransportCoordinatedInferenceAction expects. TransportCoordinatedInferenceAction expects an ml plugin
-     * TextEmbeddingResults.</p>
-     *
-     * <p>For other results like SparseEmbeddingResults, this method can be a pass through to the transformToLegacyFormat.</p>
+     * TransportCoordinatedInferenceAction expects an ml plugin TextEmbeddingResults or SparseEmbeddingResults.</p>
      */
     default List<? extends InferenceResults> transformToCoordinationFormat() {
         throw new UnsupportedOperationException("transformToCoordinationFormat() is not implemented");
     }
 
-    /**
-     * Transform the result to match the format required for versions prior to
-     * {@link org.elasticsearch.TransportVersions#V_8_12_0}
-     */
-    default List<? extends InferenceResults> transformToLegacyFormat() {
-        throw new UnsupportedOperationException("transformToLegacyFormat() is not implemented");
-    }
-
     /**
      * Convert the result to a map to aid with test assertions
      */

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/action/InferenceAction.java

@@ -580,12 +580,8 @@ public Flow.Publisher<InferenceServiceResults.Result> publisher() {
 
         @Override
         public void writeTo(StreamOutput out) throws IOException {
-            if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
-                out.writeNamedWriteable(results);
-            } else {
-                out.writeNamedWriteable(results.transformToLegacyFormat().get(0));
-            }
             // streaming isn't supported via Writeable yet
+            out.writeNamedWriteable(results);
         }
 
         @Override

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/results/ChatCompletionResults.java

@@ -68,11 +68,6 @@ public List<? extends InferenceResults> transformToCoordinationFormat() {
         return results;
     }
 
-    @Override
-    public List<? extends InferenceResults> transformToLegacyFormat() {
-        throw new UnsupportedOperationException();
-    }
-
     public List<Result> getResults() {
         return results;
     }

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/results/RankedDocsResults.java

@@ -196,11 +196,6 @@ public List<? extends InferenceResults> transformToCoordinationFormat() {
         throw new UnsupportedOperationException("Coordination format not supported by " + NAME);
     }
 
-    @Override
-    public List<? extends InferenceResults> transformToLegacyFormat() {
-        throw new UnsupportedOperationException("Legacy format not supported by " + NAME);
-    }
-
     @Override
     public Map<String, Object> asMap() {
         Map<String, Object> map = new LinkedHashMap<>();

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/results/SparseEmbeddingResults.java

@@ -100,11 +100,6 @@ public Map<String, Object> asMap() {
 
     @Override
     public List<? extends InferenceResults> transformToCoordinationFormat() {
-        return transformToLegacyFormat();
-    }
-
-    @Override
-    public List<? extends InferenceResults> transformToLegacyFormat() {
         return embeddings.stream()
             .map(
                 embedding -> new TextExpansionResults(

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/results/TextEmbeddingBitResults.java

@@ -83,16 +83,6 @@ public List<? extends InferenceResults> transformToCoordinationFormat() {
             .toList();
     }
 
-    @Override
-    @SuppressWarnings("deprecation")
-    public List<? extends InferenceResults> transformToLegacyFormat() {
-        var legacyEmbedding = new LegacyTextEmbeddingResults(
-            embeddings.stream().map(embedding -> new LegacyTextEmbeddingResults.Embedding(embedding.toFloatArray())).toList()
-        );
-
-        return List.of(legacyEmbedding);
-    }
-
     public Map<String, Object> asMap() {
         Map<String, Object> map = new LinkedHashMap<>();
         map.put(TEXT_EMBEDDING_BITS, embeddings);

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/results/TextEmbeddingByteResults.java

@@ -85,16 +85,6 @@ public List<? extends InferenceResults> transformToCoordinationFormat() {
             .toList();
     }
 
-    @Override
-    @SuppressWarnings("deprecation")
-    public List<? extends InferenceResults> transformToLegacyFormat() {
-        var legacyEmbedding = new LegacyTextEmbeddingResults(
-            embeddings.stream().map(embedding -> new LegacyTextEmbeddingResults.Embedding(embedding.toFloatArray())).toList()
-        );
-
-        return List.of(legacyEmbedding);
-    }
-
     public Map<String, Object> asMap() {
         Map<String, Object> map = new LinkedHashMap<>();
         map.put(TEXT_EMBEDDING_BYTES, embeddings);