Merge branch 'main' into sa-filter-reserved-roles-from-get-roles-api

Author: slobodanadamovic

muted-tests.yml

@@ -373,9 +373,6 @@ tests:
 - class: org.elasticsearch.search.CrossClusterSearchUnavailableClusterIT
   method: testSearchSkipUnavailable
   issue: https://github.com/elastic/elasticsearch/issues/121497
-- class: org.elasticsearch.xpack.esql.action.CrossClusterAsyncQueryStopIT
-  method: testStopQueryLocal
-  issue: https://github.com/elastic/elasticsearch/issues/121672
 - class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlSpecIT
   issue: https://github.com/elastic/elasticsearch/issues/121411
 - class: org.elasticsearch.smoketest.DocsClientYamlTestSuiteIT
@@ -398,6 +395,11 @@ tests:
 - class: org.elasticsearch.xpack.esql.plugin.DataNodeRequestSenderTests
   method: testDoNotRetryOnRequestLevelFailure
   issue: https://github.com/elastic/elasticsearch/issues/121966
+- class: org.elasticsearch.xpack.searchablesnapshots.hdfs.SecureHdfsSearchableSnapshotsIT
+  issue: https://github.com/elastic/elasticsearch/issues/121967
+- class: org.elasticsearch.xpack.esql.parser.StatementParserTests
+  method: testInvalidJoinPatterns
+  issue: https://github.com/elastic/elasticsearch/issues/121968
 
 # Examples:
 #

test/external-modules/esql-heap-attack/src/javaRestTest/java/org/elasticsearch/xpack/esql/heap_attack/HeapAttackIT.java

@@ -684,6 +684,7 @@ private Map<String, Object> lookupExplosion(int sensorDataCount, int lookupEntri
             return responseAsMap(query(query.toString(), null));
         } finally {
             deleteIndex("sensor_data");
+            deleteIndex("sensor_lookup");
         }
     }
 

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/AbstractCrossClusterTestCase.java

@@ -23,6 +23,7 @@
 import org.elasticsearch.transport.RemoteClusterAware;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.json.JsonXContent;
+import org.junit.After;
 import org.junit.Before;
 
 import java.io.IOException;
@@ -107,6 +108,13 @@ public void resetPlugin() {
         CrossClusterAsyncQueryIT.CountingPauseFieldPlugin.resetPlugin();
     }
 
+    @After
+    public void releaseLatches() {
+        SimplePauseFieldPlugin.release();
+        FailingPauseFieldPlugin.release();
+        CrossClusterAsyncQueryIT.CountingPauseFieldPlugin.release();
+    }
+
     protected void assertClusterInfoSuccess(EsqlExecutionInfo.Cluster cluster, int numShards) {
         assertThat(cluster.getTook().millis(), greaterThanOrEqualTo(0L));
         assertThat(cluster.getStatus(), equalTo(EsqlExecutionInfo.Cluster.Status.SUCCESSFUL));

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/CrossClustersCancellationIT.java

@@ -27,6 +27,7 @@
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.json.JsonXContent;
 import org.elasticsearch.xpack.esql.plugin.ComputeService;
+import org.junit.After;
 import org.junit.Before;
 
 import java.util.ArrayList;
@@ -76,6 +77,11 @@ public void resetPlugin() {
         SimplePauseFieldPlugin.resetPlugin();
     }
 
+    @After
+    public void releasePlugin() {
+        SimplePauseFieldPlugin.release();
+    }
+
     @Override
     protected boolean reuseClusters() {
         return false;

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/FailingPauseFieldPlugin.java

@@ -29,6 +29,10 @@ public static void resetPlugin() {
         startEmitting = new CountDownLatch(1);
     }
 
+    public static void release() {
+        allowEmitting.countDown();
+    }
+
     @Override
     public void onStartExecute() {
         startEmitting.countDown();

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/SimplePauseFieldPlugin.java

@@ -24,6 +24,10 @@ public static void resetPlugin() {
         startEmitting = new CountDownLatch(1);
     }
 
+    public static void release() {
+        allowEmitting.countDown();
+    }
+
     @Override
     public void onStartExecute() {
         startEmitting.countDown();