Merge branch 'main' into assert-no-duplicate-task-executors

Author: elasticmachine

benchmarks/src/main/java/org/elasticsearch/benchmark/search/aggregations/TermsReduceBenchmark.java

@@ -111,7 +111,7 @@ public void setup() {
                 dict[i] = new BytesRef(Long.toString(rand.nextLong()));
             }
             for (int i = 0; i < numShards; i++) {
-                aggsList.add(InternalAggregations.from(Collections.singletonList(newTerms(rand, dict, true))));
+                aggsList.add(InternalAggregations.from(newTerms(rand, dict, true)));
             }
         }
 
@@ -124,7 +124,7 @@ private StringTerms newTerms(Random rand, BytesRef[] dict, boolean withNested) {
             for (BytesRef term : randomTerms) {
                 InternalAggregations subAggs;
                 if (withNested) {
-                    subAggs = InternalAggregations.from(Collections.singletonList(newTerms(rand, dict, false)));
+                    subAggs = InternalAggregations.from(newTerms(rand, dict, false));
                 } else {
                     subAggs = InternalAggregations.EMPTY;
                 }

benchmarks/src/main/java/org/elasticsearch/benchmark/search/aggregations/bucket/terms/StringTermsSerializationBenchmark.java

@@ -50,13 +50,13 @@ public class StringTermsSerializationBenchmark {
 
     @Setup
     public void initResults() {
-        results = DelayableWriteable.referencing(InternalAggregations.from(List.of(newTerms(true))));
+        results = DelayableWriteable.referencing(InternalAggregations.from(newTerms(true)));
     }
 
     private StringTerms newTerms(boolean withNested) {
         List<StringTerms.Bucket> resultBuckets = new ArrayList<>(buckets);
         for (int i = 0; i < buckets; i++) {
-            InternalAggregations inner = withNested ? InternalAggregations.from(List.of(newTerms(false))) : InternalAggregations.EMPTY;
+            InternalAggregations inner = withNested ? InternalAggregations.from(newTerms(false)) : InternalAggregations.EMPTY;
             resultBuckets.add(new StringTerms.Bucket(new BytesRef("test" + i), i, inner, false, 0, DocValueFormat.RAW));
         }
         return new StringTerms(

build-tools-internal/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=7ebdac923867a3cec0098302416d1e3c6c0c729fc4e2e05c10637a8af33a76c5
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
+distributionSha256Sum=296742a352f0b20ec14b143fb684965ad66086c7810b7b255dee216670716175
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

build-tools-internal/src/main/resources/minimumGradleVersion

@@ -1 +1 @@
-8.12
+8.12.1

docs/README.asciidoc

@@ -157,16 +157,15 @@ used for its modifiers:
   * `// TESTRESPONSE[skip:reason]`: Skip the assertions specified by this
   response.
 * `// TESTSETUP`: Marks this snippet as the "setup" for all other snippets in
-  this file. This is a somewhat natural way of structuring documentation. You
-  say "this is the data we use to explain this feature" then you add the
-  snippet that you mark `// TESTSETUP` and then every snippet will turn into
-  a test that runs the setup snippet first. See the "painless" docs for a file
-  that puts this to good use. This is fairly similar to `// TEST[setup:name]`
-  but rather than the setup defined in `docs/build.gradle` the setup is defined
-  right in the documentation file. In general, we should prefer `// TESTSETUP`
-  over `// TEST[setup:name]` because it makes it more clear what steps have to
-  be taken before the examples will work. Tip: `// TESTSETUP` can only be used
-  on the first snippet of a document.
+  this file. In order to enhance clarity and simplify understanding for readers,
+  a straightforward approach involves marking the first snippet in the documentation file with the 
+  `// TESTSETUP` marker. By doing so, it clearly indicates that this particular snippet serves as the setup 
+  or preparation step for all subsequent snippets in the file. 
+  This helps in explaining the necessary steps that need to be executed before running the examples.
+  Unlike the alternative convention `// TEST[setup:name]`, which relies on a setup defined in a separate file,
+  this convention brings the setup directly into the documentation file, making it more self-contained and reducing ambiguity.
+  By adopting this convention, users can easily identify and follow the correct sequence 
+  of steps to ensure that the examples provided in the documentation work as intended.
 * `// TEARDOWN`: Ends and cleans up a test series started with `// TESTSETUP` or
   `// TEST[setup:name]`. You can use `// TEARDOWN` to set up multiple tests in
   the same file.

docs/build.gradle

@@ -120,7 +120,6 @@ testClusters.matching { it.name == "yamlRestTest"}.configureEach {
   // TODO: remove this once cname is prepended to transport.publish_address by default in 8.0
   systemProperty 'es.transport.cname_in_publish_address', 'true'
 
-  systemProperty 'es.queryable_built_in_roles_enabled', 'false'
 
   requiresFeature 'es.index_mode_feature_flag_registered', Version.fromString("8.0.0")
   requiresFeature 'es.failure_store_feature_flag_enabled', Version.fromString("8.12.0")

docs/changelog/116026.yaml

@@ -0,0 +1,13 @@
+pr: 116026
+summary: Change Elasticsearch timeouts to 429 response instead of 5xx
+area: Infra/Core
+type: breaking
+issues: []
+breaking:
+  title: Change most Elasticsearch timeouts to 429 response instead of 5xx
+  area: REST API
+  details: When a timeout occurs in most REST requests, whether via a per-request timeout, or a system default, the
+    request would return a 5xx response code. The response code from those APIs when a timeout occurs is now 429.
+  impact: Adjust any code relying on retrying on 5xx responses for timeouts to look for a 429 response code and
+    inspect the response to determine whether a timeout occured.
+  notable: false

docs/changelog/119968.yaml

@@ -0,0 +1,5 @@
+pr: 119968
+summary: Reset relocation/allocation failure counter on node join/shutdown
+area: Allocation
+type: enhancement
+issues: []

docs/changelog/120168.yaml

@@ -0,0 +1,5 @@
+pr: 120168
+summary: Reduce Data Loss in System Indices Migration
+area: Infra/Core
+type: bug
+issues: []

docs/changelog/120222.yaml

@@ -0,0 +1,5 @@
+pr: 120222
+summary: Adding linear retriever to support weighted sums of sub-retrievers
+area: "Search"
+type: enhancement
+issues: []