diff --git a/muted-tests.yml b/muted-tests.yml index 86be6d8b8e8a4..5ad35cb2191bc 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -311,9 +311,6 @@ tests: - class: org.elasticsearch.repositories.s3.RepositoryS3EcsCredentialsRestIT method: testNonexistentBucketReadonlyFalse issue: https://github.com/elastic/elasticsearch/issues/118225 -- class: org.elasticsearch.reservedstate.service.RepositoriesFileSettingsIT - method: testSettingsApplied - issue: https://github.com/elastic/elasticsearch/issues/116694 - class: org.elasticsearch.discovery.ec2.DiscoveryEc2AvailabilityZoneAttributeNoImdsIT method: testAvailabilityZoneAttribute issue: https://github.com/elastic/elasticsearch/issues/118564 diff --git a/server/src/internalClusterTest/java/org/elasticsearch/reservedstate/service/RepositoriesFileSettingsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/reservedstate/service/RepositoriesFileSettingsIT.java index 7b284979611e2..2f73f1e32c739 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/reservedstate/service/RepositoriesFileSettingsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/reservedstate/service/RepositoriesFileSettingsIT.java @@ -15,9 +15,11 @@ import org.elasticsearch.action.admin.cluster.repositories.put.PutRepositoryRequest; import org.elasticsearch.action.admin.cluster.repositories.put.TransportPutRepositoryAction; import org.elasticsearch.action.admin.cluster.repositories.reservedstate.ReservedRepositoryAction; +import org.elasticsearch.action.admin.cluster.state.ClusterStateRequest; import org.elasticsearch.client.internal.Client; import org.elasticsearch.cluster.ClusterChangedEvent; import org.elasticsearch.cluster.ClusterStateListener; +import org.elasticsearch.cluster.metadata.RepositoryMetadata; import org.elasticsearch.cluster.metadata.ReservedStateErrorMetadata; import org.elasticsearch.cluster.metadata.ReservedStateHandlerMetadata; import org.elasticsearch.cluster.metadata.ReservedStateMetadata; @@ -129,13 +131,15 @@ private void assertClusterStateSaveOK(CountDownLatch savedClusterState, AtomicLo boolean awaitSuccessful = savedClusterState.await(20, TimeUnit.SECONDS); assertTrue(awaitSuccessful); + clusterAdmin().state(new ClusterStateRequest(TEST_REQUEST_TIMEOUT).waitForMetadataVersion(metadataVersion.get())).get(); + final var reposResponse = client().execute( GetRepositoriesAction.INSTANCE, new GetRepositoriesRequest(TEST_REQUEST_TIMEOUT, new String[] { "repo", "repo1" }) ).get(); assertThat( - reposResponse.repositories().stream().map(r -> r.name()).collect(Collectors.toSet()), + reposResponse.repositories().stream().map(RepositoryMetadata::name).collect(Collectors.toSet()), containsInAnyOrder("repo", "repo1") );