Skip to content

Fix DataStreamLifecycleDownsampleIT.testUpdateDownsampleSamplingMode #138174

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
Nov 18, 2025
Merged

Fix DataStreamLifecycleDownsampleIT.testUpdateDownsampleSamplingMode #138174

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
118edcf
Fix `DataStreamLifecycleDownsampleIT.testUpdateDownsampleSamplingMode`
nielsbauman Nov 17, 2025
b8ac224
Merge branch 'main' into fix-dlm-test
nielsbauman Nov 18, 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 @@ -453,9 +453,6 @@ tests:
- class: org.elasticsearch.upgrades.IndexSortUpgradeIT
method: testIndexSortForNumericTypes {upgradedNodes=1}
issue: https://github.com/elastic/elasticsearch/issues/138130
- class: org.elasticsearch.xpack.downsample.DataStreamLifecycleDownsampleIT
method: testUpdateDownsampleSamplingMode
issue: https://github.com/elastic/elasticsearch/issues/138135
- class: org.elasticsearch.xpack.inference.integration.CCMServiceIT
method: testCreatesEisChatCompletionEndpoint
issue: https://github.com/elastic/elasticsearch/issues/138206
Expand Down
5 changes: 1 addition & 4 deletions ...lClusterTest/java/org/elasticsearch/xpack/downsample/DataStreamLifecycleDownsampleIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import org.elasticsearch.core.TimeValue;
import org.elasticsearch.datastreams.lifecycle.DataStreamLifecycleService;
import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval;
import org.elasticsearch.test.ClusterServiceUtils;
import org.elasticsearch.test.junit.annotations.TestLogging;

import java.util.HashSet;
Expand Down Expand Up @@ -352,17 +351,15 @@ public void testUpdateDownsampleSamplingMode() throws Exception {
rolloverResponse = safeGet(client().execute(RolloverAction.INSTANCE, new RolloverRequest(dataStreamName, null)));
assertTrue(rolloverResponse.isRolledOver());
String downsampledPrefix = "downsample-10m-";
final var waitForUpdatedDownsamplingRound = ClusterServiceUtils.addMasterTemporaryStateListener(clusterState -> {
awaitClusterState(clusterState -> {
ProjectMetadata projectMetadata = clusterState.metadata().getProject();
final var dataStream = projectMetadata.dataStreams().get(dataStreamName);
if (dataStream == null) {
return false;
}

return dataStream.getIndices().size() > 2
&& dataStream.getIndices().stream().filter(index -> index.getName().startsWith(downsampledPrefix)).count() == 2;
});
safeAwait(waitForUpdatedDownsamplingRound);
assertDownsamplingMethod(initialSamplingMethod, downsampledPrefix + firstBackingIndex);
assertDownsamplingMethod(updatedSamplingMethod, downsampledPrefix + secondBackingIndex);
}
Expand Down