Merge remote-tracking branch 'upstream/main' into fix_fileservice_race_condition

jfreden · jfreden · commit 50a952e0186d · 2025-05-23T15:40:56.000+02:00
diff --git a/muted-tests.yml b/muted-tests.yml
@@ -474,6 +474,9 @@ tests:
 - class: org.elasticsearch.packaging.test.TemporaryDirectoryConfigTests
   method: test21AcceptsCustomPathInDocker
   issue: https://github.com/elastic/elasticsearch/issues/128114
+- class: org.elasticsearch.reservedstate.service.FileSettingsServiceIT
+  method: testSymlinkUpdateTriggerReload
+  issue: https://github.com/elastic/elasticsearch/issues/128369
 
 # Examples:
 #

Original file line number	Diff line number	Diff line change
`@@ -474,6 +474,9 @@ tests:`
`474`	`474`	`- class: org.elasticsearch.packaging.test.TemporaryDirectoryConfigTests`
`475`	`475`	`method: test21AcceptsCustomPathInDocker`
`476`	`476`	`issue: https://github.com/elastic/elasticsearch/issues/128114`
	`477`	`+- class: org.elasticsearch.reservedstate.service.FileSettingsServiceIT`
	`478`	`+ method: testSymlinkUpdateTriggerReload`
	`479`	`+ issue: https://github.com/elastic/elasticsearch/issues/128369`
`477`	`480`
`478`	`481`	`# Examples:`
`479`	`482`	`#`