Skip to content

Test fix: use the same random sampling method throughout the test. #137506

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

Test fix: use the same random sampling method throughout the test. #137506

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
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 @@ -498,9 +498,6 @@ tests:
- class: org.elasticsearch.xpack.security.CoreWithSecurityClientYamlTestSuiteIT
method: test {yaml=indices.validate_query/20_query_string/validate_query with query_string parameters}
issue: https://github.com/elastic/elasticsearch/issues/137391
- class: org.elasticsearch.xpack.downsample.ILMDownsampleDisruptionIT
method: testILMDownsampleRollingRestart
issue: https://github.com/elastic/elasticsearch/issues/137489
- class: org.elasticsearch.smoketest.SmokeTestIngestWithAllDepsClientYamlTestSuiteIT
method: test {yaml=ingest/100_sampling_with_reroute/Test get sample with multiple reroutes}
issue: https://github.com/elastic/elasticsearch/issues/137457
Expand Down
12 changes: 6 additions & 6 deletions ...nternalClusterTest/java/org/elasticsearch/xpack/downsample/ILMDownsampleDisruptionIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertResponse;
import static org.elasticsearch.xcontent.XContentFactory.jsonBuilder;
import static org.elasticsearch.xpack.core.rollup.ConfigTestHelpers.randomInterval;
import static org.hamcrest.Matchers.equalTo;

@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, numClientNodes = 4)
Expand Down Expand Up @@ -87,7 +86,8 @@ protected Settings nodeSettings(int nodeOrdinal, Settings otherSettings) {
return nodeSettings.build();
}

public void setup(final String sourceIndex, int numOfShards, int numOfReplicas, long startTime) throws IOException {
public void setup(final String sourceIndex, int numOfShards, int numOfReplicas, long startTime, DownsampleConfig config)
throws IOException {
final Settings.Builder settings = indexSettings(numOfShards, numOfReplicas).put(IndexSettings.MODE.getKey(), IndexMode.TIME_SERIES)
.putList(IndexMetadata.INDEX_ROUTING_PATH.getKey(), List.of(FIELD_DIMENSION_KEYWORD))
.put(
Expand Down Expand Up @@ -123,10 +123,10 @@ public void setup(final String sourceIndex, int numOfShards, int numOfReplicas,
Map.of(
"downsample",
new org.elasticsearch.xpack.core.ilm.DownsampleAction(
DateHistogramInterval.HOUR,
config.getFixedInterval(),
null,
randomBoolean(),
randomSamplingMethod()
config.getSamplingMethod()
)
)
)
Expand All @@ -145,9 +145,9 @@ public void testILMDownsampleRollingRestart() throws Exception {

final String sourceIndex = randomAlphaOfLength(10).toLowerCase(Locale.ROOT);
long startTime = LocalDateTime.parse("1993-09-09T18:00:00").atZone(ZoneId.of("UTC")).toInstant().toEpochMilli();
setup(sourceIndex, 1, 0, startTime);
DownsampleConfig.SamplingMethod samplingMethod = randomSamplingMethod();
final DownsampleConfig config = new DownsampleConfig(randomInterval(), samplingMethod);
final DownsampleConfig config = new DownsampleConfig(DateHistogramInterval.HOUR, samplingMethod);
setup(sourceIndex, 1, 0, startTime, config);
final Supplier<XContentBuilder> sourceSupplier = () -> {
final String ts = randomDateForInterval(config.getInterval(), startTime);
double counterValue = DATE_FORMATTER.parseMillis(ts);
Expand Down