Skip to content

Fix data stream retrieval in DataStreamLifecycleServiceRuntimeSecurityIT #125667

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
Apr 1, 2025
Merged

Fix data stream retrieval in DataStreamLifecycleServiceRuntimeSecurityIT #125667

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
60fc5f1
Fix data stream retrieval in `DataStreamLifecycleServiceRuntimeSecuri…
nielsbauman Mar 26, 2025
fc85cfd
Merge branch 'main' into fix-dlm-security-test
nielsbauman Apr 1, 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 @@ -302,9 +302,6 @@ tests:
- class: org.elasticsearch.xpack.esql.action.CrossClusterAsyncQueryStopIT
method: testStopQueryLocal
issue: https://github.com/elastic/elasticsearch/issues/121672
- class: org.elasticsearch.integration.DataStreamLifecycleServiceRuntimeSecurityIT
method: testRolloverLifecycleAndForceMergeAuthorized
issue: https://github.com/elastic/elasticsearch/issues/124978
- class: org.elasticsearch.packaging.test.BootstrapCheckTests
method: test10Install
issue: https://github.com/elastic/elasticsearch/issues/124957
Expand Down
24 changes: 10 additions & 14 deletions ...rTest/java/org/elasticsearch/integration/DataStreamLifecycleServiceRuntimeSecurityIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,23 +97,19 @@ public void testRolloverLifecycleAndForceMergeAuthorized() throws Exception {
// empty lifecycle contains the default rollover
prepareDataStreamAndIndex(dataStreamName, DataStreamLifecycle.Template.DEFAULT);

assertBusy(() -> {
assertNoAuthzErrors();
List<Index> backingIndices = getDataStreamBackingIndices(dataStreamName);
assertThat(backingIndices.size(), equalTo(2));
String backingIndex = backingIndices.get(0).getName();
assertThat(backingIndex, backingIndexEqualTo(dataStreamName, 1));
String writeIndex = backingIndices.get(1).getName();
assertThat(writeIndex, backingIndexEqualTo(dataStreamName, 2));
});
List<String> backingIndices = waitForDataStreamBackingIndices(dataStreamName, 2);
String backingIndex = backingIndices.get(0);
assertThat(backingIndex, backingIndexEqualTo(dataStreamName, 1));
String writeIndex = backingIndices.get(1);
assertThat(writeIndex, backingIndexEqualTo(dataStreamName, 2));

assertNoAuthzErrors();
// Index another doc to force another rollover and trigger an attempted force-merge. The force-merge may be a noop under
// the hood but for authz purposes this doesn't matter, it only matters that the force-merge API was called
indexDoc(dataStreamName);
assertBusy(() -> {
assertNoAuthzErrors();
List<Index> backingIndices = getDataStreamBackingIndices(dataStreamName);
assertThat(backingIndices.size(), equalTo(3));
});

waitForDataStreamBackingIndices(dataStreamName, 3);
assertNoAuthzErrors();
}

public void testRolloverAndRetentionAuthorized() throws Exception {
Expand Down