Merge branch 'main' into ES-11328-node-cli-tests

elasticmachine · web-flow · commit 4812f14201f1 · 2025-06-16T08:28:37.000+02:00
diff --git a/muted-tests.yml b/muted-tests.yml
@@ -541,6 +541,9 @@ tests:
 - class: org.elasticsearch.xpack.ml.integration.ClassificationIT
   method: testWithDatastreams
   issue: https://github.com/elastic/elasticsearch/issues/129457
+- class: org.elasticsearch.index.engine.ThreadPoolMergeExecutorServiceDiskSpaceTests
+  method: testMergeTasksAreUnblockedWhenMoreDiskSpaceBecomesAvailable
+  issue: https://github.com/elastic/elasticsearch/issues/129296
 
 # Examples:
 #

Original file line number	Diff line number	Diff line change
`@@ -541,6 +541,9 @@ tests:`
`541`	`541`	`- class: org.elasticsearch.xpack.ml.integration.ClassificationIT`
`542`	`542`	`method: testWithDatastreams`
`543`	`543`	`issue: https://github.com/elastic/elasticsearch/issues/129457`
	`544`	`+- class: org.elasticsearch.index.engine.ThreadPoolMergeExecutorServiceDiskSpaceTests`
	`545`	`+ method: testMergeTasksAreUnblockedWhenMoreDiskSpaceBecomesAvailable`
	`546`	`+ issue: https://github.com/elastic/elasticsearch/issues/129296`
`544`	`547`
`545`	`548`	`# Examples:`
`546`	`549`	`#`