Skip to content

Commit 7585952

Browse files
authored
[8.x] Skip flaky configuration in randomized testing for logsdb (#120859) (#120860)
* Skip flaky configuration in randomized testing for logsdb (#120859) (cherry picked from commit 1cb2a65) # Conflicts: # muted-tests.yml * Update muted-tests.yml
1 parent 10558f8 commit 7585952

File tree

3 files changed

+5
-34
lines changed

3 files changed

+5
-34
lines changed

muted-tests.yml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -444,21 +444,3 @@ tests:
444444
- class: org.elasticsearch.xpack.esql.action.CrossClusterAsyncEnrichStopIT
445445
method: testEnrichAfterStop
446446
issue: https://github.com/elastic/elasticsearch/issues/120757
447-
- class: org.elasticsearch.xpack.logsdb.qa.StoredSourceLogsDbVersusReindexedLogsDbChallengeRestIT
448-
method: testTermsQuery
449-
issue: https://github.com/elastic/elasticsearch/issues/120853
450-
- class: org.elasticsearch.xpack.logsdb.qa.StoredSourceLogsDbVersusReindexedLogsDbChallengeRestIT
451-
method: testMatchAllQuery
452-
issue: https://github.com/elastic/elasticsearch/issues/120854
453-
- class: org.elasticsearch.xpack.logsdb.qa.StandardVersusLogsIndexModeRandomDataChallengeRestIT
454-
method: testMatchAllQuery
455-
issue: https://github.com/elastic/elasticsearch/issues/120855
456-
- class: org.elasticsearch.xpack.logsdb.qa.StandardVersusLogsIndexModeRandomDataChallengeRestIT
457-
method: testTermsQuery
458-
issue: https://github.com/elastic/elasticsearch/issues/120856
459-
- class: org.elasticsearch.xpack.logsdb.qa.StandardVersusStandardReindexedIntoLogsDbChallengeRestIT
460-
method: testMatchAllQuery
461-
issue: https://github.com/elastic/elasticsearch/issues/120857
462-
- class: org.elasticsearch.xpack.logsdb.qa.StandardVersusStandardReindexedIntoLogsDbChallengeRestIT
463-
method: testTermsQuery
464-
issue: https://github.com/elastic/elasticsearch/issues/120858

test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/FieldType.java

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,9 @@
1111

1212
import org.elasticsearch.logsdb.datageneration.datasource.DataSource;
1313
import org.elasticsearch.logsdb.datageneration.fields.leaf.ByteFieldDataGenerator;
14-
import org.elasticsearch.logsdb.datageneration.fields.leaf.DoubleFieldDataGenerator;
15-
import org.elasticsearch.logsdb.datageneration.fields.leaf.FloatFieldDataGenerator;
16-
import org.elasticsearch.logsdb.datageneration.fields.leaf.HalfFloatFieldDataGenerator;
1714
import org.elasticsearch.logsdb.datageneration.fields.leaf.IntegerFieldDataGenerator;
1815
import org.elasticsearch.logsdb.datageneration.fields.leaf.KeywordFieldDataGenerator;
1916
import org.elasticsearch.logsdb.datageneration.fields.leaf.LongFieldDataGenerator;
20-
import org.elasticsearch.logsdb.datageneration.fields.leaf.ScaledFloatFieldDataGenerator;
2117
import org.elasticsearch.logsdb.datageneration.fields.leaf.ShortFieldDataGenerator;
2218
import org.elasticsearch.logsdb.datageneration.fields.leaf.UnsignedLongFieldDataGenerator;
2319

@@ -30,11 +26,7 @@ public enum FieldType {
3026
UNSIGNED_LONG("unsigned_long"),
3127
INTEGER("integer"),
3228
SHORT("short"),
33-
BYTE("byte"),
34-
DOUBLE("double"),
35-
FLOAT("float"),
36-
HALF_FLOAT("half_float"),
37-
SCALED_FLOAT("scaled_float");
29+
BYTE("byte");
3830

3931
private final String name;
4032

@@ -50,10 +42,6 @@ public FieldDataGenerator generator(String fieldName, DataSource dataSource) {
5042
case INTEGER -> new IntegerFieldDataGenerator(fieldName, dataSource);
5143
case SHORT -> new ShortFieldDataGenerator(fieldName, dataSource);
5244
case BYTE -> new ByteFieldDataGenerator(fieldName, dataSource);
53-
case DOUBLE -> new DoubleFieldDataGenerator(fieldName, dataSource);
54-
case FLOAT -> new FloatFieldDataGenerator(fieldName, dataSource);
55-
case HALF_FLOAT -> new HalfFloatFieldDataGenerator(fieldName, dataSource);
56-
case SCALED_FLOAT -> new ScaledFloatFieldDataGenerator(fieldName, dataSource);
5745
};
5846
}
5947

test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/datasource/DefaultMappingParametersHandler.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ public DataSourceResponse.LeafMappingParametersGenerator handle(DataSourceReques
3232

3333
return new DataSourceResponse.LeafMappingParametersGenerator(switch (request.fieldType()) {
3434
case KEYWORD -> keywordMapping(request, map);
35-
case LONG, INTEGER, SHORT, BYTE, DOUBLE, FLOAT, HALF_FLOAT, UNSIGNED_LONG -> plain(map);
36-
case SCALED_FLOAT -> scaledFloatMapping(map);
35+
case LONG, INTEGER, SHORT, BYTE, UNSIGNED_LONG -> plain(map);
36+
3737
});
3838
}
3939

@@ -61,7 +61,8 @@ private Supplier<Map<String, Object>> keywordMapping(
6161
.collect(Collectors.toSet());
6262

6363
if (options.isEmpty() == false) {
64-
injected.put("copy_to", ESTestCase.randomFrom(options));
64+
// TODO: re-enable once #120831 is resolved
65+
// injected.put("copy_to", ESTestCase.randomFrom(options));
6566
}
6667
}
6768

0 commit comments

Comments
 (0)