Merge remote-tracking branch 'origin/main' into lucene_snapshot

Author: elasticsearchmachine

modules/repository-gcs/src/main/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageBlobContainer.java

@@ -145,13 +145,11 @@ public void compareAndExchangeRegister(
         BytesReference updated,
         ActionListener<OptionalBytesReference> listener
     ) {
-        if (skipCas(listener)) return;
         ActionListener.completeWith(listener, () -> blobStore.compareAndExchangeRegister(buildKey(key), path, key, expected, updated));
     }
 
     @Override
     public void getRegister(OperationPurpose purpose, String key, ActionListener<OptionalBytesReference> listener) {
-        if (skipCas(listener)) return;
         ActionListener.completeWith(listener, () -> blobStore.getRegister(buildKey(key), path, key));
     }
 }

modules/repository-gcs/src/test/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageBlobContainerRetriesTests.java

@@ -59,9 +59,6 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static fixture.gcs.GoogleCloudStorageHttpHandler.getContentRangeEnd;
-import static fixture.gcs.GoogleCloudStorageHttpHandler.getContentRangeLimit;
-import static fixture.gcs.GoogleCloudStorageHttpHandler.getContentRangeStart;
 import static fixture.gcs.GoogleCloudStorageHttpHandler.parseMultipartRequestBody;
 import static fixture.gcs.TestUtils.createServiceAccount;
 import static java.nio.charset.StandardCharsets.UTF_8;
@@ -369,14 +366,14 @@ public void testWriteLargeBlob() throws IOException {
 
                     assertThat(Math.toIntExact(requestBody.length()), anyOf(equalTo(defaultChunkSize), equalTo(lastChunkSize)));
 
-                    final int rangeStart = getContentRangeStart(range);
-                    final int rangeEnd = getContentRangeEnd(range);
+                    final HttpHeaderParser.ContentRange contentRange = HttpHeaderParser.parseContentRangeHeader(range);
+                    final int rangeStart = Math.toIntExact(contentRange.start());
+                    final int rangeEnd = Math.toIntExact(contentRange.end());
                     assertThat(rangeEnd + 1 - rangeStart, equalTo(Math.toIntExact(requestBody.length())));
                     assertThat(new BytesArray(data, rangeStart, rangeEnd - rangeStart + 1), is(requestBody));
                     bytesReceived.updateAndGet(existing -> Math.max(existing, rangeEnd));
 
-                    final Integer limit = getContentRangeLimit(range);
-                    if (limit != null) {
+                    if (contentRange.size() != null) {
                         exchange.sendResponseHeaders(RestStatus.OK.getStatus(), -1);
                         return;
                     } else {

muted-tests.yml

@@ -279,6 +279,9 @@ tests:
 - class: org.elasticsearch.lucene.RollingUpgradeSearchableSnapshotIndexCompatibilityIT
   method: testSearchableSnapshotUpgrade {p0=[9.0.0, 9.0.0, 9.0.0]}
   issue: https://github.com/elastic/elasticsearch/issues/119562
+- class: org.elasticsearch.xpack.ml.integration.ForecastIT
+  method: testOverflowToDisk
+  issue: https://github.com/elastic/elasticsearch/issues/117740
 
 # Examples:
 #

server/src/main/java/org/elasticsearch/common/blobstore/support/AbstractBlobContainer.java

@@ -9,7 +9,6 @@
 
 package org.elasticsearch.common.blobstore.support;
 
-import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.common.blobstore.BlobContainer;
 import org.elasticsearch.common.blobstore.BlobPath;
 
@@ -24,17 +23,6 @@ protected AbstractBlobContainer(BlobPath path) {
         this.path = path;
     }
 
-    /**
-     * Temporary check that permits disabling CAS operations at runtime; TODO remove this when no longer needed
-     */
-    protected static boolean skipCas(ActionListener<?> listener) {
-        if ("true".equals(System.getProperty("test.repository_test_kit.skip_cas"))) {
-            listener.onFailure(new UnsupportedOperationException());
-            return true;
-        }
-        return false;
-    }
-
     @Override
     public BlobPath path() {
         return this.path;

server/src/main/java/org/elasticsearch/search/aggregations/AggregatorsReducer.java

@@ -12,7 +12,10 @@
 import org.elasticsearch.core.Releasable;
 import org.elasticsearch.core.Releasables;
 
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -54,7 +57,12 @@ public void accept(InternalAggregations aggregations) {
      * returns the reduced {@link InternalAggregations}.
      */
     public InternalAggregations get() {
-        return InternalAggregations.from(aggByName.values().stream().map(AggregatorReducer::get).toList());
+        final Collection<AggregatorReducer> reducers = aggByName.values();
+        final List<InternalAggregation> aggs = new ArrayList<>(reducers.size());
+        for (AggregatorReducer reducer : reducers) {
+            aggs.add(reducer.get());
+        }
+        return InternalAggregations.from(aggs);
     }
 
     @Override