Skip to content

[SPARK-41695][BUILD][3.3] Upgrade netty to 4.1.86.Final #39196

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

Closed
tobiasstadler wants to merge 1 commit into from
Closed

[SPARK-41695][BUILD][3.3] Upgrade netty to 4.1.86.Final #39196

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
23 changes: 23 additions & 0 deletions common/network-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,33 @@
</dependency>

<!-- Core dependencies -->
<!-- Netty Begin -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<classifier>linux-x86_64</classifier>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<classifier>linux-aarch_64</classifier>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
<classifier>osx-aarch_64</classifier>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
<classifier>osx-x86_64</classifier>
</dependency>
<!-- Netty End -->

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
Expand Down
8 changes: 8 additions & 0 deletions common/network-common/src/main/java/org/apache/spark/network/util/NettyUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,14 @@ public static PooledByteBufAllocator createPooledByteBufAllocator(
if (numCores == 0) {
numCores = Runtime.getRuntime().availableProcessors();
}
// SPARK-38541: After upgrade to Netty 4.1.75, there are 2 behavior changes of this method:
// 1. `PooledByteBufAllocator.defaultMaxOrder()` change from 11 to 9, this means the default
// `PooledByteBufAllocator` chunk size reduce from 16 MiB to 4 MiB, we need use
// `-Dio.netty.allocator.maxOrder=11` to keep the chunk size of PooledByteBufAllocator
// to 16m.
// 2. `PooledByteBufAllocator.defaultUseCacheForAllThreads()` change from true to false, we need
// to use `-Dio.netty.allocator.useCacheForAllThreads=true` to
// enable `useCacheForAllThreads`.
return new PooledByteBufAllocator(
allowDirectBufs && PlatformDependent.directBufferPreferred(),
Math.min(PooledByteBufAllocator.defaultNumHeapArena(), numCores),
Expand Down
22 changes: 22 additions & 0 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,10 +304,32 @@
<artifactId>jersey-test-framework-provider-simple</artifactId>
<scope>test</scope>
</dependency>
<!-- Netty Begin -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<classifier>linux-x86_64</classifier>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<classifier>linux-aarch_64</classifier>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
<classifier>osx-aarch_64</classifier>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
<classifier>osx-x86_64</classifier>
</dependency>
<!-- Netty End -->
<dependency>
<groupId>com.clearspring.analytics</groupId>
<artifactId>stream</artifactId>
Expand Down
29 changes: 14 additions & 15 deletions dev/deps/spark-deps-hadoop-2-hive-2.3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,21 +200,20 @@ metrics-jmx/4.2.7//metrics-jmx-4.2.7.jar
metrics-json/4.2.7//metrics-json-4.2.7.jar
metrics-jvm/4.2.7//metrics-jvm-4.2.7.jar
minlog/1.3.0//minlog-1.3.0.jar
netty-all/4.1.74.Final//netty-all-4.1.74.Final.jar
netty-buffer/4.1.74.Final//netty-buffer-4.1.74.Final.jar
netty-codec/4.1.74.Final//netty-codec-4.1.74.Final.jar
netty-common/4.1.74.Final//netty-common-4.1.74.Final.jar
netty-handler/4.1.74.Final//netty-handler-4.1.74.Final.jar
netty-resolver/4.1.74.Final//netty-resolver-4.1.74.Final.jar
netty-tcnative-classes/2.0.48.Final//netty-tcnative-classes-2.0.48.Final.jar
netty-transport-classes-epoll/4.1.74.Final//netty-transport-classes-epoll-4.1.74.Final.jar
netty-transport-classes-kqueue/4.1.74.Final//netty-transport-classes-kqueue-4.1.74.Final.jar
netty-transport-native-epoll/4.1.74.Final/linux-aarch_64/netty-transport-native-epoll-4.1.74.Final-linux-aarch_64.jar
netty-transport-native-epoll/4.1.74.Final/linux-x86_64/netty-transport-native-epoll-4.1.74.Final-linux-x86_64.jar
netty-transport-native-kqueue/4.1.74.Final/osx-aarch_64/netty-transport-native-kqueue-4.1.74.Final-osx-aarch_64.jar
netty-transport-native-kqueue/4.1.74.Final/osx-x86_64/netty-transport-native-kqueue-4.1.74.Final-osx-x86_64.jar
netty-transport-native-unix-common/4.1.74.Final//netty-transport-native-unix-common-4.1.74.Final.jar
netty-transport/4.1.74.Final//netty-transport-4.1.74.Final.jar
netty-all/4.1.86.Final//netty-all-4.1.86.Final.jar
netty-buffer/4.1.86.Final//netty-buffer-4.1.86.Final.jar
netty-codec/4.1.86.Final//netty-codec-4.1.86.Final.jar
netty-common/4.1.86.Final//netty-common-4.1.86.Final.jar
netty-handler/4.1.86.Final//netty-handler-4.1.86.Final.jar
netty-resolver/4.1.86.Final//netty-resolver-4.1.86.Final.jar
netty-transport-classes-epoll/4.1.86.Final//netty-transport-classes-epoll-4.1.86.Final.jar
netty-transport-classes-kqueue/4.1.86.Final//netty-transport-classes-kqueue-4.1.86.Final.jar
netty-transport-native-epoll/4.1.86.Final/linux-aarch_64/netty-transport-native-epoll-4.1.86.Final-linux-aarch_64.jar
netty-transport-native-epoll/4.1.86.Final/linux-x86_64/netty-transport-native-epoll-4.1.86.Final-linux-x86_64.jar
netty-transport-native-kqueue/4.1.86.Final/osx-aarch_64/netty-transport-native-kqueue-4.1.86.Final-osx-aarch_64.jar
netty-transport-native-kqueue/4.1.86.Final/osx-x86_64/netty-transport-native-kqueue-4.1.86.Final-osx-x86_64.jar
netty-transport-native-unix-common/4.1.86.Final//netty-transport-native-unix-common-4.1.86.Final.jar
netty-transport/4.1.86.Final//netty-transport-4.1.86.Final.jar
objenesis/3.2//objenesis-3.2.jar
okhttp/3.12.12//okhttp-3.12.12.jar
okio/1.14.0//okio-1.14.0.jar
Expand Down
29 changes: 14 additions & 15 deletions dev/deps/spark-deps-hadoop-3-hive-2.3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,21 +186,20 @@ metrics-jmx/4.2.7//metrics-jmx-4.2.7.jar
metrics-json/4.2.7//metrics-json-4.2.7.jar
metrics-jvm/4.2.7//metrics-jvm-4.2.7.jar
minlog/1.3.0//minlog-1.3.0.jar
netty-all/4.1.74.Final//netty-all-4.1.74.Final.jar
netty-buffer/4.1.74.Final//netty-buffer-4.1.74.Final.jar
netty-codec/4.1.74.Final//netty-codec-4.1.74.Final.jar
netty-common/4.1.74.Final//netty-common-4.1.74.Final.jar
netty-handler/4.1.74.Final//netty-handler-4.1.74.Final.jar
netty-resolver/4.1.74.Final//netty-resolver-4.1.74.Final.jar
netty-tcnative-classes/2.0.48.Final//netty-tcnative-classes-2.0.48.Final.jar
netty-transport-classes-epoll/4.1.74.Final//netty-transport-classes-epoll-4.1.74.Final.jar
netty-transport-classes-kqueue/4.1.74.Final//netty-transport-classes-kqueue-4.1.74.Final.jar
netty-transport-native-epoll/4.1.74.Final/linux-aarch_64/netty-transport-native-epoll-4.1.74.Final-linux-aarch_64.jar
netty-transport-native-epoll/4.1.74.Final/linux-x86_64/netty-transport-native-epoll-4.1.74.Final-linux-x86_64.jar
netty-transport-native-kqueue/4.1.74.Final/osx-aarch_64/netty-transport-native-kqueue-4.1.74.Final-osx-aarch_64.jar
netty-transport-native-kqueue/4.1.74.Final/osx-x86_64/netty-transport-native-kqueue-4.1.74.Final-osx-x86_64.jar
netty-transport-native-unix-common/4.1.74.Final//netty-transport-native-unix-common-4.1.74.Final.jar
netty-transport/4.1.74.Final//netty-transport-4.1.74.Final.jar
netty-all/4.1.86.Final//netty-all-4.1.86.Final.jar
netty-buffer/4.1.86.Final//netty-buffer-4.1.86.Final.jar
netty-codec/4.1.86.Final//netty-codec-4.1.86.Final.jar
netty-common/4.1.86.Final//netty-common-4.1.86.Final.jar
netty-handler/4.1.86.Final//netty-handler-4.1.86.Final.jar
netty-resolver/4.1.86.Final//netty-resolver-4.1.86.Final.jar
netty-transport-classes-epoll/4.1.86.Final//netty-transport-classes-epoll-4.1.86.Final.jar
netty-transport-classes-kqueue/4.1.86.Final//netty-transport-classes-kqueue-4.1.86.Final.jar
netty-transport-native-epoll/4.1.86.Final/linux-aarch_64/netty-transport-native-epoll-4.1.86.Final-linux-aarch_64.jar
netty-transport-native-epoll/4.1.86.Final/linux-x86_64/netty-transport-native-epoll-4.1.86.Final-linux-x86_64.jar
netty-transport-native-kqueue/4.1.86.Final/osx-aarch_64/netty-transport-native-kqueue-4.1.86.Final-osx-aarch_64.jar
netty-transport-native-kqueue/4.1.86.Final/osx-x86_64/netty-transport-native-kqueue-4.1.86.Final-osx-x86_64.jar
netty-transport-native-unix-common/4.1.86.Final//netty-transport-native-unix-common-4.1.86.Final.jar
netty-transport/4.1.86.Final//netty-transport-4.1.86.Final.jar
objenesis/3.2//objenesis-3.2.jar
okhttp/3.12.12//okhttp-3.12.12.jar
okio/1.14.0//okio-1.14.0.jar
Expand Down
42 changes: 41 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@
<commons-cli.version>1.5.0</commons-cli.version>
<bouncycastle.version>1.60</bouncycastle.version>
<tink.version>1.6.1</tink.version>
<netty.version>4.1.86.Final</netty.version>
<!--
If you are changing Arrow version specification, please check
./python/pyspark/sql/pandas/utils.py, and ./python/setup.py too.
Expand Down Expand Up @@ -817,10 +818,12 @@
<artifactId>RoaringBitmap</artifactId>
<version>0.9.25</version>
</dependency>

<!-- Netty Begin -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>4.1.74.Final</version>
<version>${netty.version}</version>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
Expand Down Expand Up @@ -894,8 +897,45 @@
<groupId>io.netty</groupId>
<artifactId>netty-transport-udt</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-handler-ssl-ocsp</artifactId>
</exclusion>
<exclusion>
<groupId>org.jctools</groupId>
<artifactId>jctools-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- SPARK-38885: After Netty 4.1.76, add the following `Netty` dependencies explicitly
to ensure `./dev/test-dependencies.sh` produce the same results on Linux and MacOS.
-->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<version>${netty.version}</version>
<classifier>linux-x86_64</classifier>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<version>${netty.version}</version>
<classifier>linux-aarch_64</classifier>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
<version>${netty.version}</version>
<classifier>osx-aarch_64</classifier>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
<version>${netty.version}</version>
<classifier>osx-x86_64</classifier>
</dependency>
<!-- Netty End -->

<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
Expand Down