Skip to content

Commit 44c9271

Browse files
authored
Ensure that fields copied using copy_to are not present in synthetic source (#112625)
1 parent 074e76b commit 44c9271

25 files changed

+784
-217
lines changed

modules/data-streams/src/javaRestTest/java/org/elasticsearch/datastreams/logsdb/qa/StandardVersusLogsIndexModeRandomDataChallengeRestIT.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ public class StandardVersusLogsIndexModeRandomDataChallengeRestIT extends Standa
4343

4444
public StandardVersusLogsIndexModeRandomDataChallengeRestIT() {
4545
super();
46-
this.subobjects = randomFrom(ObjectMapper.Subobjects.values());
46+
// TODO enable subobjects: auto
47+
// It is disabled because it currently does not have auto flattening and that results in asserts being triggered when using copy_to.
48+
this.subobjects = randomValueOtherThan(ObjectMapper.Subobjects.AUTO, () -> randomFrom(ObjectMapper.Subobjects.values()));
4749
this.keepArraySource = randomBoolean();
4850

4951
var specificationBuilder = DataGeneratorSpecification.builder().withFullyDynamicMapping(randomBoolean());
@@ -120,6 +122,14 @@ public CheckedConsumer<XContentBuilder, IOException> fieldValueGenerator() {
120122
.build());
121123
}
122124

125+
@Override
126+
protected final Settings restClientSettings() {
127+
return Settings.builder()
128+
.put(super.restClientSettings())
129+
.put(org.elasticsearch.test.rest.ESRestTestCase.CLIENT_SOCKET_TIMEOUT, "9000s")
130+
.build();
131+
}
132+
123133
@Override
124134
public void baselineMappings(XContentBuilder builder) throws IOException {
125135
dataGenerator.writeMapping(builder);

0 commit comments

Comments
 (0)