Skip to content

Commit c098a6c

Browse files
original-brownbearoriginal-brownbear
authored
Upgrade to Netty 4.1.85 (elastic#91846)
Just staying up to date. Also, removed the long deprecated and unused tiny cache size configuration from the allocator while I was at it.
1 parent 4ee518c commit c098a6c

File tree

4 files changed

+45
-42
lines changed

4 files changed

+45
-42
lines changed

‎build-tools-internal/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ecsLogging = 1.2.0
1717

1818
jna = 5.10.0
1919

20-
netty = 4.1.84.Final
20+
netty = 4.1.85.Final
2121

2222
commons_lang3 = 3.9
2323

‎docs/changelog/91846.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 91846
2+
summary: Upgrade to Netty 4.1.85
3+
area: Network
4+
type: upgrade
5+
issues: []

‎gradle/verification-metadata.xml

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1189,89 +1189,89 @@
11891189
<sha256 value="7b0171a4e8bcd573e08d9f2bba053c67b557ab5012106a5982ccbae5743814c0" origin="Generated by Gradle"/>
11901190
</artifact>
11911191
</component>
1192-
<component group="io.netty" name="netty-buffer" version="4.1.84.Final">
1193-
<artifact name="netty-buffer-4.1.84.Final.jar">
1194-
<sha256 value="5341cbdb7ed9b23d008f14cca36f910b309446723b4f41bb866f522c6cf699c2" origin="Generated by Gradle"/>
1192+
<component group="io.netty" name="netty-buffer" version="4.1.85.Final">
1193+
<artifact name="netty-buffer-4.1.85.Final.jar">
1194+
<sha256 value="740ab512ec6fce4f0d2b9bb4b532dfb0d359bfbabaf259f81ab31efc9eb080e6" origin="Generated by Gradle"/>
11951195
</artifact>
11961196
</component>
11971197
<component group="io.netty" name="netty-codec" version="4.1.42.Final">
11981198
<artifact name="netty-codec-4.1.42.Final.jar">
11991199
<sha256 value="e96ced697fb7df589da7c20c995e01f75a9cb246be242bbc4cd3b4af424ff189" origin="Generated by Gradle"/>
12001200
</artifact>
12011201
</component>
1202-
<component group="io.netty" name="netty-codec" version="4.1.84.Final">
1203-
<artifact name="netty-codec-4.1.84.Final.jar">
1204-
<sha256 value="b659961e1e066d37d6e23c31973e616704b277fdbc6b18489ecac26f1ef801dd" origin="Generated by Gradle"/>
1202+
<component group="io.netty" name="netty-codec" version="4.1.85.Final">
1203+
<artifact name="netty-codec-4.1.85.Final.jar">
1204+
<sha256 value="625e47e43fe60f12475215fcfa6dd5468e01c8b4b07d9a831b8a9d1d519fb9a2" origin="Generated by Gradle"/>
12051205
</artifact>
12061206
</component>
1207-
<component group="io.netty" name="netty-codec-dns" version="4.1.84.Final">
1208-
<artifact name="netty-codec-dns-4.1.84.Final.jar">
1209-
<sha256 value="94a56a1c83a2261e76e9383e970d6f8eafa7e0fcd87ba616b770ab5244151b2a" origin="Generated by Gradle"/>
1207+
<component group="io.netty" name="netty-codec-dns" version="4.1.85.Final">
1208+
<artifact name="netty-codec-dns-4.1.85.Final.jar">
1209+
<sha256 value="b6c9deb92d544b60e52bd5eb7946d7b105cf2afbdd3f8f8d09a9928db4310bec" origin="Generated by Gradle"/>
12101210
</artifact>
12111211
</component>
1212-
<component group="io.netty" name="netty-codec-http" version="4.1.84.Final">
1213-
<artifact name="netty-codec-http-4.1.84.Final.jar">
1214-
<sha256 value="2585e2457de9db9d9195ae36cbbfb2432d85123672ec4a6831c6bb41a217c1b8" origin="Generated by Gradle"/>
1212+
<component group="io.netty" name="netty-codec-http" version="4.1.85.Final">
1213+
<artifact name="netty-codec-http-4.1.85.Final.jar">
1214+
<sha256 value="86941f4cdfa8f3365909fe86480202ccfc836d999917567755d5602e4eaaac24" origin="Generated by Gradle"/>
12151215
</artifact>
12161216
</component>
1217-
<component group="io.netty" name="netty-codec-http2" version="4.1.84.Final">
1218-
<artifact name="netty-codec-http2-4.1.84.Final.jar">
1219-
<sha256 value="15e1a1911708883c2e3cc50f7e38f535902353dcb8d274b0ec21087cc9fcbdcf" origin="Generated by Gradle"/>
1217+
<component group="io.netty" name="netty-codec-http2" version="4.1.85.Final">
1218+
<artifact name="netty-codec-http2-4.1.85.Final.jar">
1219+
<sha256 value="9fbd3f943d4ae30947a9cee0c36e36605c951ea64010028ffc97e055499880e9" origin="Generated by Gradle"/>
12201220
</artifact>
12211221
</component>
1222-
<component group="io.netty" name="netty-codec-socks" version="4.1.84.Final">
1223-
<artifact name="netty-codec-socks-4.1.84.Final.jar">
1224-
<sha256 value="676061ec6065b704864049c1801d3e4ac695841a1152f2a6dfe41b59fdeee1c3" origin="Generated by Gradle"/>
1222+
<component group="io.netty" name="netty-codec-socks" version="4.1.85.Final">
1223+
<artifact name="netty-codec-socks-4.1.85.Final.jar">
1224+
<sha256 value="6c7419a93e0270759a05e6a0f26ed82d4b7b179132e149fb6e13d524fa935081" origin="Generated by Gradle"/>
12251225
</artifact>
12261226
</component>
12271227
<component group="io.netty" name="netty-common" version="4.1.42.Final">
12281228
<artifact name="netty-common-4.1.42.Final.jar">
12291229
<sha256 value="3d0a918d78292eeca02a7bb2188daa4e5053b6e29b71e6308309033e121242b5" origin="Generated by Gradle"/>
12301230
</artifact>
12311231
</component>
1232-
<component group="io.netty" name="netty-common" version="4.1.84.Final">
1233-
<artifact name="netty-common-4.1.84.Final.jar">
1234-
<sha256 value="50da7383e882acbd8bca9d823797bff62fa91c91f74f0da575816e3214a25560" origin="Generated by Gradle"/>
1232+
<component group="io.netty" name="netty-common" version="4.1.85.Final">
1233+
<artifact name="netty-common-4.1.85.Final.jar">
1234+
<sha256 value="3643ccccf94b66e1b7279d82ee9653ee47e5c8f271d0aa38c744d911bfb11cc1" origin="Generated by Gradle"/>
12351235
</artifact>
12361236
</component>
12371237
<component group="io.netty" name="netty-handler" version="4.1.42.Final">
12381238
<artifact name="netty-handler-4.1.42.Final.jar">
12391239
<sha256 value="11eda86500c33b9d386719b5419f513fd9c097d13894f25dd0c75b610d636e03" origin="Generated by Gradle"/>
12401240
</artifact>
12411241
</component>
1242-
<component group="io.netty" name="netty-handler" version="4.1.84.Final">
1243-
<artifact name="netty-handler-4.1.84.Final.jar">
1244-
<sha256 value="0b6814893c88374e6bf474d5a2df04ee912c89dbc885b8115ac393238382e3f5" origin="Generated by Gradle"/>
1242+
<component group="io.netty" name="netty-handler" version="4.1.85.Final">
1243+
<artifact name="netty-handler-4.1.85.Final.jar">
1244+
<sha256 value="c45ff524850527bb7b837f7f25743aa5109e5b20b549c09a01800d665625fb99" origin="Generated by Gradle"/>
12451245
</artifact>
12461246
</component>
1247-
<component group="io.netty" name="netty-handler-proxy" version="4.1.84.Final">
1248-
<artifact name="netty-handler-proxy-4.1.84.Final.jar">
1249-
<sha256 value="f385da33bc1df4cfe2f8162ae9d62c2be838cc30ae55f749ecdaff958188cbfa" origin="Generated by Gradle"/>
1247+
<component group="io.netty" name="netty-handler-proxy" version="4.1.85.Final">
1248+
<artifact name="netty-handler-proxy-4.1.85.Final.jar">
1249+
<sha256 value="3869c89ae49e3ad13e823eab1c6d1d0ae6eb50046c52ba67cd50a9749531660a" origin="Generated by Gradle"/>
12501250
</artifact>
12511251
</component>
12521252
<component group="io.netty" name="netty-resolver" version="4.1.42.Final">
12531253
<artifact name="netty-resolver-4.1.42.Final.jar">
12541254
<sha256 value="89768242b6b7cce9bd9f5945ad21d1b4bae515c6b1bf03a8af5d1899779cebc9" origin="Generated by Gradle"/>
12551255
</artifact>
12561256
</component>
1257-
<component group="io.netty" name="netty-resolver" version="4.1.84.Final">
1258-
<artifact name="netty-resolver-4.1.84.Final.jar">
1259-
<sha256 value="0876172e3cf4bbcecdce812ed145b17bc3fb5c645f3ed1873d9c56da1aa150b1" origin="Generated by Gradle"/>
1257+
<component group="io.netty" name="netty-resolver" version="4.1.85.Final">
1258+
<artifact name="netty-resolver-4.1.85.Final.jar">
1259+
<sha256 value="2caacf0fec5e43408dee2a4851d3f393d9b4fc5441deb52299c5d053d87208b3" origin="Generated by Gradle"/>
12601260
</artifact>
12611261
</component>
1262-
<component group="io.netty" name="netty-resolver-dns" version="4.1.84.Final">
1263-
<artifact name="netty-resolver-dns-4.1.84.Final.jar">
1264-
<sha256 value="d7a90c6443c7a1b0189ac0cd8dac1a559b79de9cc4f465c2c6797260561fd4b6" origin="Generated by Gradle"/>
1262+
<component group="io.netty" name="netty-resolver-dns" version="4.1.85.Final">
1263+
<artifact name="netty-resolver-dns-4.1.85.Final.jar">
1264+
<sha256 value="bc14fdc9c639000f8d553bd3d7fe9e7248ee9318d2a4ab620e2862f550fd7fed" origin="Generated by Gradle"/>
12651265
</artifact>
12661266
</component>
12671267
<component group="io.netty" name="netty-transport" version="4.1.42.Final">
12681268
<artifact name="netty-transport-4.1.42.Final.jar">
12691269
<sha256 value="dfa817a156ea263aa9ad8364a2e226527665c9722aca40a7945f228c2c14f1da" origin="Generated by Gradle"/>
12701270
</artifact>
12711271
</component>
1272-
<component group="io.netty" name="netty-transport" version="4.1.84.Final">
1273-
<artifact name="netty-transport-4.1.84.Final.jar">
1274-
<sha256 value="ccfd4168ec83b1949b10e8927211dd8f9f89df984dec477cc63eb49a1209ee75" origin="Generated by Gradle"/>
1272+
<component group="io.netty" name="netty-transport" version="4.1.85.Final">
1273+
<artifact name="netty-transport-4.1.85.Final.jar">
1274+
<sha256 value="00128d81916fd6c58c60a3fb62162955dbe7ee9aa4f4db7a58d71ee7214bbf76" origin="Generated by Gradle"/>
12751275
</artifact>
12761276
</component>
12771277
<component group="io.netty" name="netty-transport-native-epoll" version="4.1.42.Final">
@@ -1284,9 +1284,9 @@
12841284
<sha256 value="508fba9128da78bd775ba854d71917ceb2b00b95a7600254f54a277a06761a86" origin="Generated by Gradle"/>
12851285
</artifact>
12861286
</component>
1287-
<component group="io.netty" name="netty-transport-native-unix-common" version="4.1.84.Final">
1288-
<artifact name="netty-transport-native-unix-common-4.1.84.Final.jar">
1289-
<sha256 value="28c17f526eeb7ac23530f75b5ec28ca55c76c5466923ea7e0b93b085c6e1d6f3" origin="Generated by Gradle"/>
1287+
<component group="io.netty" name="netty-transport-native-unix-common" version="4.1.85.Final">
1288+
<artifact name="netty-transport-native-unix-common-4.1.85.Final.jar">
1289+
<sha256 value="092ad4289b17428e678013e8b3b18edc1978e000ccbe19e6933285b91b90363c" origin="Generated by Gradle"/>
12901290
</artifact>
12911291
</component>
12921292
<component group="io.opencensus" name="opencensus-api" version="0.28.0">

‎modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/NettyAllocator.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ public class NettyAllocator {
9898
maxOrder = 5;
9999
}
100100
}
101-
int tinyCacheSize = PooledByteBufAllocator.defaultTinyCacheSize();
102101
int smallCacheSize = PooledByteBufAllocator.defaultSmallCacheSize();
103102
int normalCacheSize = PooledByteBufAllocator.defaultNormalCacheSize();
104103
boolean useCacheForAllThreads = PooledByteBufAllocator.defaultUseCacheForAllThreads();
@@ -108,7 +107,6 @@ public class NettyAllocator {
108107
0,
109108
pageSize,
110109
maxOrder,
111-
tinyCacheSize,
112110
smallCacheSize,
113111
normalCacheSize,
114112
useCacheForAllThreads

0 commit comments

Comments
 (0)