Skip to content

Commit 79f7c39

Browse files
committed
Merge branch 'main' into esql_found_docs
2 parents 3011344 + 6174acd commit 79f7c39

File tree

4 files changed

+13
-3
lines changed

4 files changed

+13
-3
lines changed

docs/changelog/126806.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 126806
2+
summary: Workaround max name limit imposed by Jackson 2.17
3+
area: Infra/Core
4+
type: bug
5+
issues: []

libs/entitlement/src/main/java/org/elasticsearch/entitlement/initialization/EntitlementInitialization.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,15 +230,13 @@ private static PolicyManager createPolicyManager() {
230230
new ReadStoreAttributesEntitlement(),
231231
new CreateClassLoaderEntitlement(),
232232
new InboundNetworkEntitlement(),
233-
new OutboundNetworkEntitlement(),
234233
new LoadNativeLibrariesEntitlement(),
235234
new ManageThreadsEntitlement(),
236235
new FilesEntitlement(serverModuleFileDatas)
237236
)
238237
),
239238
new Scope("java.desktop", List.of(new LoadNativeLibrariesEntitlement())),
240239
new Scope("org.apache.httpcomponents.httpclient", List.of(new OutboundNetworkEntitlement())),
241-
new Scope("io.netty.transport", List.of(new InboundNetworkEntitlement(), new OutboundNetworkEntitlement())),
242240
new Scope(
243241
"org.apache.lucene.core",
244242
List.of(

libs/x-content/impl/src/main/java/org/elasticsearch/xcontent/provider/XContentImplUtils.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ public class XContentImplUtils {
1717
public static <F extends JsonFactory, B extends TSFBuilder<F, B>> F configure(TSFBuilder<F, B> builder) {
1818
// jackson 2.15 introduced a max string length. We have other limits in place to constrain max doc size,
1919
// so here we set to max value (2GiB) so as not to constrain further than those existing limits.
20-
return builder.streamReadConstraints(StreamReadConstraints.builder().maxStringLength(Integer.MAX_VALUE).build()).build();
20+
// jackson 2.16 further introduced a max name length, which we also relax here temporarily.
21+
// see https://github.com/elastic/elasticsearch/issues/58952
22+
return builder.streamReadConstraints(
23+
StreamReadConstraints.builder().maxStringLength(Integer.MAX_VALUE).maxNameLength(Integer.MAX_VALUE).build()
24+
).build();
2125
}
2226
}

muted-tests.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,9 @@ tests:
402402
- class: org.elasticsearch.search.SearchServiceSingleNodeTests
403403
method: testLookUpSearchContext
404404
issue: https://github.com/elastic/elasticsearch/issues/126813
405+
- class: org.elasticsearch.xpack.test.rest.XPackRestIT
406+
method: test {p0=transform/transforms_stats/Test get multiple transform stats where one does not have a task}
407+
issue: https://github.com/elastic/elasticsearch/issues/126863
405408

406409
# Examples:
407410
#

0 commit comments

Comments
 (0)