Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TEST] Fix staleness in fetching component templates #93321

Merged
merged 2 commits into from
Jan 31, 2023
Merged

[TEST] Fix staleness in fetching component templates #93321

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
275c477
[TEST] Retry fetching component templates
Jan 27, 2023
23e8a12
Use metadata version to get the latest state.
Jan 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions ...erTest/java/org/elasticsearch/reservedstate/service/ComponentTemplatesFileSettingsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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<String, ComposableIndexTemplate> 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")
);

Expand Down Expand Up @@ -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");
Expand Down