Merge branch 'main' into svilen/multimatch_args

Author: svilen-mihaylov-elastic

build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/PublishPluginFuncTest.groovy

@@ -9,11 +9,16 @@
 
 package org.elasticsearch.gradle.internal
 
+import spock.lang.IgnoreIf
+
 import org.elasticsearch.gradle.fixtures.AbstractGradleFuncTest
 import org.gradle.testkit.runner.TaskOutcome
 import org.xmlunit.builder.DiffBuilder
 import org.xmlunit.builder.Input
 
+// Ignoring this test on windows due to what appears to be a bug in the gradle testkit runner.
+// https://github.com/elastic/elasticsearch/issues/129100
+@IgnoreIf({ os.isWindows() })
 class PublishPluginFuncTest extends AbstractGradleFuncTest {
 
     def setup() {

build-tools-internal/src/main/groovy/elasticsearch.bc-upgrade-test.gradle

@@ -0,0 +1,18 @@
+/*
+ * 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".
+ */
+
+import org.elasticsearch.gradle.Version
+import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
+
+tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) {
+  // We use a phony version here as the real version is provided via `tests.bwc.main.version` system property
+  usesBwcDistribution(Version.fromString("0.0.0"))
+  systemProperty("tests.old_cluster_version", "0.0.0")
+  onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null }
+}

docs/changelog/129367.yaml

@@ -0,0 +1,5 @@
+pr: 129367
+summary: Run `TransportGetStatusAction` on local node
+area: ILM+SLM
+type: enhancement
+issues: []

docs/changelog/129391.yaml

@@ -0,0 +1,7 @@
+pr: 129391
+summary: Ensure that anomaly detection job state update retries if master node is
+  temoporarily unavailable
+area: Machine Learning
+type: bug
+issues:
+ - 126148

modules/ingest-geoip/qa/full-cluster-restart/build.gradle

@@ -11,7 +11,7 @@ import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
 
 apply plugin: 'elasticsearch.internal-java-rest-test'
 apply plugin: 'elasticsearch.bwc-test'
-
+apply plugin: 'elasticsearch.bc-upgrade-test'
 
 dependencies {
   javaRestTestImplementation project(':test:fixtures:geoip-fixture')

muted-tests.yml

@@ -523,6 +523,12 @@ tests:
 - class: org.elasticsearch.xpack.autoscaling.storage.ReactiveStorageIT
   method: testScaleDuringSplitOrClone
   issue: https://github.com/elastic/elasticsearch/issues/129335
+- class: org.elasticsearch.entitlement.runtime.policy.FileAccessTreeTests
+  method: testWindowsMixedCaseAccess
+  issue: https://github.com/elastic/elasticsearch/issues/129167
+- class: org.elasticsearch.entitlement.runtime.policy.FileAccessTreeTests
+  method: testWindowsAbsolutPathAccess
+  issue: https://github.com/elastic/elasticsearch/issues/129168
 
 # Examples:
 #

qa/full-cluster-restart/build.gradle

@@ -13,6 +13,7 @@ import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
 apply plugin: 'elasticsearch.internal-java-rest-test'
 apply plugin: 'elasticsearch.internal-test-artifact'
 apply plugin: 'elasticsearch.bwc-test'
+apply plugin: 'elasticsearch.bc-upgrade-test'
 
 buildParams.bwcVersions.withIndexCompatible { bwcVersion, baseName ->
   tasks.register(bwcTaskName(bwcVersion), StandaloneRestIntegTestTask) {

qa/rolling-upgrade/build.gradle

@@ -14,6 +14,7 @@ apply plugin: 'elasticsearch.internal-java-rest-test'
 apply plugin: 'elasticsearch.internal-test-artifact-base'
 apply plugin: 'elasticsearch.bwc-test'
 apply plugin: 'elasticsearch.fwc-test'
+apply plugin: 'elasticsearch.bc-upgrade-test'
 
 testArtifacts {
   registerTestArtifactFromSourceSet(sourceSets.javaRestTest)
@@ -26,18 +27,6 @@ buildParams.bwcVersions.withWireCompatible { bwcVersion, baseName ->
   }
 }
 
-tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) {
-  // We use a phony version here as the real version is provided via `tests.bwc.main.version` system property
-  usesBwcDistribution(Version.fromString("0.0.0"))
-  systemProperty("tests.old_cluster_version", "0.0.0")
-  onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null }
-  filter {
-    // filter tests initially for quicker iterations
-    // TODO remove once expanding the test set to other modules
-    includeTestsMatching("org.elasticsearch.upgrades.IndexingIT")
-  }
-}
-
 tasks.withType(Test).configureEach {
   // CI doesn't like it when there's multiple clusters running at once
   maxParallelForks = 1

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

@@ -195,6 +195,7 @@ static TransportVersion def(int id) {
     public static final TransportVersion ML_INFERENCE_MISTRAL_CHAT_COMPLETION_ADDED_8_19 = def(8_841_0_47);
     public static final TransportVersion ML_INFERENCE_ELASTIC_RERANK_ADDED_8_19 = def(8_841_0_48);
     public static final TransportVersion NONE_CHUNKING_STRATEGY_8_19 = def(8_841_0_49);
+    public static final TransportVersion IDP_CUSTOM_SAML_ATTRIBUTES_ALLOW_LIST_8_19 = def(8_841_0_50);
     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);
@@ -296,6 +297,7 @@ static TransportVersion def(int id) {
     public static final TransportVersion SEARCH_LOAD_PER_INDEX_STATS = def(9_095_0_00);
     public static final TransportVersion HEAP_USAGE_IN_CLUSTER_INFO = def(9_096_0_00);
     public static final TransportVersion NONE_CHUNKING_STRATEGY = def(9_097_0_00);
+    public static final TransportVersion PROJECT_DELETION_GLOBAL_BLOCK = def(9_098_0_00);
 
     /*
      * STOP! READ THIS FIRST! No, really,

server/src/main/java/org/elasticsearch/cluster/ClusterState.java

@@ -873,21 +873,24 @@ private Iterator<ToXContent> blocksXContentMultiProjects() {
                 }
                 builder.endObject();
             }
-            if (blocks().noIndexBlockAllProjects() == false) {
+            if (blocks().noProjectHasAProjectBlock() == false) {
                 builder.startArray("projects");
             }
             return builder;
         };
         final ToXContent after = (builder, params) -> {
-            if (blocks().noIndexBlockAllProjects() == false) {
+            if (blocks().noProjectHasAProjectBlock() == false) {
                 builder.endArray();
             }
             return builder.endObject();
         };
         return chunkedSection(
             true,
             before,
-            Iterators.map(metadata().projects().keySet().iterator(), projectId -> new Tuple<>(projectId, blocks().indices(projectId))),
+            Iterators.map(
+                metadata().projects().keySet().iterator(),
+                projectId -> new Tuple<>(projectId, blocks().projectBlocks(projectId))
+            ),
             ClusterState::projectBlocksXContent,
             after
         );
@@ -929,19 +932,37 @@ private Iterator<ToXContent> blocksXContentSingleProject(ProjectId singleProject
         );
     }
 
-    private static Iterator<ToXContent> projectBlocksXContent(Tuple<ProjectId, Map<String, Set<ClusterBlock>>> entry) {
-        return chunkedSection(
-            entry.v2().isEmpty() == false,
-            (builder, params) -> builder.startObject().field("id", entry.v1()).startObject("indices"),
-            entry.v2().entrySet().iterator(),
-            e -> Iterators.single((builder, params) -> {
-                builder.startObject(e.getKey());
-                for (ClusterBlock block : e.getValue()) {
+    private static Iterator<ToXContent> projectBlocksXContent(Tuple<ProjectId, ClusterBlocks.ProjectBlocks> entry) {
+        final var projectId = entry.v1();
+        final var projectBlocks = entry.v2();
+        if (projectBlocks.isEmpty()) {
+            return Collections.emptyIterator();
+        }
+        return Iterators.concat(
+            Iterators.single((builder, params) -> builder.startObject().field("id", projectId)),
+            // write project global blocks in one chunk
+            projectBlocks.projectGlobals().isEmpty() ? Collections.emptyIterator() : Iterators.single((builder, params) -> {
+                builder.startObject("project_globals");
+                for (ClusterBlock block : projectBlocks.projectGlobals()) {
                     block.toXContent(builder, params);
                 }
                 return builder.endObject();
             }),
-            (builder, params) -> builder.endObject().endObject()
+            // write index blocks for the project
+            projectBlocks.indices().isEmpty()
+                ? Collections.emptyIterator()
+                : Iterators.concat(
+                    Iterators.single((builder, params) -> builder.startObject("indices")),
+                    Iterators.flatMap(projectBlocks.indices().entrySet().iterator(), indexBlocks -> Iterators.single((builder, params) -> {
+                        builder.startObject(indexBlocks.getKey());
+                        for (ClusterBlock block : indexBlocks.getValue()) {
+                            block.toXContent(builder, params);
+                        }
+                        return builder.endObject();
+                    })),
+                    Iterators.single((builder, params) -> builder.endObject())
+                ),
+            Iterators.single((builder, params) -> builder.endObject())
         );
     }