Skip to content

[9.1] Disable downsampling force merge via mapping metadata (#135694) #135719

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 1 commit into from
Sep 30, 2025
Merged

[9.1] Disable downsampling force merge via mapping metadata (#135694) #135719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 14 additions & 2 deletions ...nsample/src/internalClusterTest/java/org/elasticsearch/xpack/downsample/DownsampleIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.io.IOException;
import java.time.Instant;
import java.util.List;
import java.util.Locale;
import java.util.function.Supplier;

import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
Expand All @@ -31,8 +32,9 @@ public class DownsampleIT extends DownsamplingIntegTestCase {
public void testDownsamplingPassthroughDimensions() throws Exception {
String dataStreamName = "metrics-foo";
// Set up template
putTSDBIndexTemplate("my-template", List.of("metrics-foo"), null, """
putTSDBIndexTemplate("my-template", List.of("metrics-foo"), null, String.format(Locale.ROOT, """
{
%s
"properties": {
"attributes": {
"type": "passthrough",
Expand All @@ -45,7 +47,7 @@ public void testDownsamplingPassthroughDimensions() throws Exception {
}
}
}
""", null, null);
""", generateForceMergeMetadata()), null, null);

// Create data stream by indexing documents
final Instant now = Instant.now();
Expand Down Expand Up @@ -96,4 +98,14 @@ public void testDownsamplingPassthroughDimensions() throws Exception {

assertDownsampleIndexFieldsAndDimensions(sourceIndex, targetIndex, downsampleConfig);
}

private String generateForceMergeMetadata() {
return switch (randomIntBetween(0, 4)) {
case 0 -> "\"_meta\": { \"downsample.forcemerge.enabled\": false},";
case 1 -> "\"_meta\": { \"downsample.forcemerge.enabled\": true},";
case 2 -> "\"_meta\": { \"downsample.forcemerge.enabled\": 4},";
case 3 -> "\"_meta\": { \"downsample.forcemerge.enabled\": null},";
default -> "";
};
}
}
2 changes: 2 additions & 0 deletions ...nternalClusterTest/java/org/elasticsearch/xpack/downsample/DownsamplingIntegTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,8 @@ void assertDownsampleIndexFieldsAndDimensions(String sourceIndex, String downsam
final CompressedXContent sourceIndexCompressedXContent = new CompressedXContent(sourceIndexMappings);
mapperService.merge(MapperService.SINGLE_MAPPING_NAME, sourceIndexCompressedXContent, MapperService.MergeReason.INDEX_TEMPLATE);

assertThat(downsampleIndexMappings.get("_meta"), equalTo(sourceIndexMappings.get("_meta")));

// Collect expected mappings for fields and dimensions
Map<String, TimeSeriesParams.MetricType> metricFields = new HashMap<>();
Map<String, String> dimensionFields = new HashMap<>();
Expand Down
Loading