Skip to content

Fix IndexTemplateRegistryRolloverIT #127695

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

Merged
merged 2 commits into from
May 6, 2025
Merged

Fix IndexTemplateRegistryRolloverIT #127695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d45ae7
Fix `IndexTemplateRegistryRolloverIT`
nielsbauman May 5, 2025
dc4d1d6
Merge branch 'main' into fix-index-template-registry-rollover-it
nielsbauman May 6, 2025
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
3 changes: 0 additions & 3 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,9 +435,6 @@ tests:
- class: org.elasticsearch.snapshots.SnapshotShutdownIT
method: testSnapshotShutdownProgressTracker
issue: https://github.com/elastic/elasticsearch/issues/127690
- class: org.elasticsearch.xpack.core.template.IndexTemplateRegistryRolloverIT
method: testRollover
issue: https://github.com/elastic/elasticsearch/issues/127692
- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
method: test {p0=search/350_point_in_time/point-in-time with index filter}
issue: https://github.com/elastic/elasticsearch/issues/127741
Expand Down
8 changes: 5 additions & 3 deletions ...usterTest/java/org/elasticsearch/xpack/core/template/IndexTemplateRegistryRolloverIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import org.elasticsearch.cluster.ClusterChangedEvent;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.metadata.DataStream;
import org.elasticsearch.cluster.metadata.ProjectId;
import org.elasticsearch.cluster.project.TestProjectResolvers;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.datastreams.DataStreamsPlugin;
Expand Down Expand Up @@ -68,7 +69,8 @@ public void setup() {
public void testRollover() throws Exception {
ClusterState state = clusterService.state();
registry.clusterChanged(new ClusterChangedEvent(IndexTemplateRegistryRolloverIT.class.getName(), state, state));
assertBusy(() -> { assertTrue(clusterService.state().metadata().getProject().templatesV2().containsKey(TEST_INDEX_TEMPLATE_ID)); });
final var projectId = ProjectId.DEFAULT;
awaitClusterState(s -> s.metadata().getProject(projectId).templatesV2().containsKey(TEST_INDEX_TEMPLATE_ID));
String dsName = TEST_INDEX_PATTERN.replace('*', '1');
CreateDataStreamAction.Request createDataStreamRequest = new CreateDataStreamAction.Request(
TEST_REQUEST_TIMEOUT,
Expand All @@ -80,7 +82,7 @@ public void testRollover() throws Exception {
assertNumberOfBackingIndices(1);
registry.incrementVersion();
registry.clusterChanged(new ClusterChangedEvent(IndexTemplateRegistryRolloverIT.class.getName(), clusterService.state(), state));
assertBusy(() -> assertTrue(getDataStream().rolloverOnWrite()));
awaitClusterState(s -> s.metadata().getProject(projectId).dataStreams().get(dsName).rolloverOnWrite());
assertNumberOfBackingIndices(1);

String timestampValue = DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.formatMillis(System.currentTimeMillis());
Expand All @@ -89,7 +91,7 @@ public void testRollover() throws Exception {
.source(String.format(Locale.ROOT, "{\"%s\":\"%s\"}", DEFAULT_TIMESTAMP_FIELD, timestampValue), XContentType.JSON)
).actionGet();
assertThat(docWriteResponse.status().getStatus(), equalTo(201));
assertBusy(() -> assertNumberOfBackingIndices(2));
awaitClusterState(s -> s.metadata().getProject(projectId).dataStreams().get(dsName).getIndices().size() == 2);
}

private void assertNumberOfBackingIndices(final int expected) {
Expand Down