diff --git a/server/src/internalClusterTest/java/org/elasticsearch/reservedstate/service/ComponentTemplatesFileSettingsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/reservedstate/service/ComponentTemplatesFileSettingsIT.java index 5afd23db73483..c7b2387b2fa6e 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/reservedstate/service/ComponentTemplatesFileSettingsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/reservedstate/service/ComponentTemplatesFileSettingsIT.java @@ -8,6 +8,8 @@ package org.elasticsearch.reservedstate.service; +import org.elasticsearch.action.admin.cluster.state.ClusterStateRequest; +import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse; import org.elasticsearch.action.admin.indices.template.get.GetComponentTemplateAction; import org.elasticsearch.action.admin.indices.template.get.GetComposableIndexTemplateAction; import org.elasticsearch.action.admin.indices.template.put.PutComponentTemplateAction; @@ -33,6 +35,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardCopyOption; +import java.util.Map; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; @@ -399,13 +402,15 @@ private void assertClusterStateSaveOK(CountDownLatch savedClusterState, AtomicLo boolean awaitSuccessful = savedClusterState.await(20, TimeUnit.SECONDS); assertTrue(awaitSuccessful); - final var response = client().execute( - GetComposableIndexTemplateAction.INSTANCE, - new GetComposableIndexTemplateAction.Request("template*") - ).get(); + final ClusterStateResponse clusterStateResponse = client().admin() + .cluster() + .state(new ClusterStateRequest().waitForMetadataVersion(metadataVersion.get())) + .actionGet(); + + Map allTemplates = clusterStateResponse.getState().metadata().templatesV2(); assertThat( - response.indexTemplates().keySet().stream().collect(Collectors.toSet()), + allTemplates.keySet().stream().collect(Collectors.toSet()), containsInAnyOrder("template_1", "template_2", "template_other") ); @@ -531,7 +536,6 @@ public void clusterChanged(ClusterChangedEvent event) { return new Tuple<>(savedClusterState, metadataVersion); } - @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/93202") public void testSettingsApplied() throws Exception { internalCluster().setBootstrapMasterNodeIndex(0); logger.info("--> start data node / non master node");