This is an automated email from the ASF dual-hosted git repository.
yangjie01 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 44b163d281b9 [SPARK-46432][BUILD] Upgrade Netty to 4.1.106.Final
44b163d281b9 is described below
commit 44b163d281b9773cab9995e690ec3f4751c8be69
Author: panbingkun <panbing...@baidu.com>
AuthorDate: Fri Jan 26 11:12:11 2024 +0800
[SPARK-46432][BUILD] Upgrade Netty to 4.1.106.Final
### What changes were proposed in this pull request?
The pr aims to upgrade `Netty` from `4.1.100.Final` to `4.1.106.Final`.
### Why are the changes needed?
- To bring the latest bug fixes
Automatically close Http2StreamChannel when
Http2FrameStreamExceptionreaches end ofChannelPipeline
([#13651](https://github.com/netty/netty/pull/13651))
Symbol not found: _netty_jni_util_JNI_OnLoad
([#13695](https://github.com/netty/netty/issues/13728))
- 4.1.106.Final release note:
https://netty.io/news/2024/01/19/4-1-106-Final.html
- 4.1.105.Final release note:
https://netty.io/news/2024/01/16/4-1-105-Final.html
- 4.1.104.Final release note:
https://netty.io/news/2023/12/15/4-1-104-Final.html
- 4.1.103.Final release note:
https://netty.io/news/2023/12/13/4-1-103-Final.html
- 4.1.101.Final release note:
https://netty.io/news/2023/11/09/4-1-101-Final.html
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Pass GA.
### Was this patch authored or co-authored using generative AI tooling?
No.
Closes #44384 from panbingkun/SPARK-46432.
Lead-authored-by: panbingkun <panbing...@baidu.com>
Co-authored-by: panbingkun <pbk1...@gmail.com>
Signed-off-by: yangjie01 <yangji...@baidu.com>
---
common/network-yarn/pom.xml | 44 ++++++++++++++++++-----------------
dev/deps/spark-deps-hadoop-3-hive-2.3 | 37 +++++++++++++++--------------
pom.xml | 2 +-
3 files changed, 43 insertions(+), 40 deletions(-)
diff --git a/common/network-yarn/pom.xml b/common/network-yarn/pom.xml
index c809bdfbbc1d..3f2ae21eeb3b 100644
--- a/common/network-yarn/pom.xml
+++ b/common/network-yarn/pom.xml
@@ -173,27 +173,29 @@
<id>unpack</id>
<phase>package</phase>
<configuration>
- <target>
- <echo message="Shade netty native libraries to
${spark.shade.native.packageName}" />
- <unzip src="${shuffle.jar}"
dest="${project.build.directory}/exploded/" />
- <move
file="${project.build.directory}/exploded/META-INF/native/libnetty_transport_native_epoll_x86_64.so"
-
tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_transport_native_epoll_x86_64.so"
/>
- <move
file="${project.build.directory}/exploded/META-INF/native/libnetty_transport_native_kqueue_x86_64.jnilib"
-
tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_transport_native_kqueue_x86_64.jnilib"
/>
- <move
file="${project.build.directory}/exploded/META-INF/native/libnetty_transport_native_epoll_aarch_64.so"
-
tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_transport_native_epoll_aarch_64.so"
/>
- <move
file="${project.build.directory}/exploded/META-INF/native/libnetty_transport_native_kqueue_aarch_64.jnilib"
-
tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_transport_native_kqueue_aarch_64.jnilib"
/>
- <move
file="${project.build.directory}/exploded/META-INF/native/libnetty_tcnative_linux_x86_64.so"
-
tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_tcnative_linux_x86_64.so"
/>
- <move
file="${project.build.directory}/exploded/META-INF/native/libnetty_tcnative_linux_aarch_64.so"
-
tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_tcnative_linux_aarch_64.so"
/>
- <move
file="${project.build.directory}/exploded/META-INF/native/libnetty_tcnative_osx_x86_64.jnilib"
-
tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_tcnative_osx_x86_64.jnilib"
/>
- <move
file="${project.build.directory}/exploded/META-INF/native/libnetty_tcnative_osx_aarch_64.jnilib"
-
tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_tcnative_osx_aarch_64.jnilib"
/>
- <jar destfile="${shuffle.jar}"
basedir="${project.build.directory}/exploded" />
- </target>
+ <target>
+ <echo message="Shade netty native libraries to
${spark.shade.native.packageName}" />
+ <unzip src="${shuffle.jar}"
dest="${project.build.directory}/exploded/" />
+ <move
file="${project.build.directory}/exploded/META-INF/native/libnetty_transport_native_epoll_x86_64.so"
+
tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_transport_native_epoll_x86_64.so"
/>
+ <move
file="${project.build.directory}/exploded/META-INF/native/libnetty_transport_native_kqueue_x86_64.jnilib"
+
tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_transport_native_kqueue_x86_64.jnilib"
/>
+ <move
file="${project.build.directory}/exploded/META-INF/native/libnetty_transport_native_epoll_aarch_64.so"
+
tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_transport_native_epoll_aarch_64.so"
/>
+ <move
file="${project.build.directory}/exploded/META-INF/native/libnetty_transport_native_kqueue_aarch_64.jnilib"
+
tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_transport_native_kqueue_aarch_64.jnilib"
/>
+ <move
file="${project.build.directory}/exploded/META-INF/native/libnetty_transport_native_epoll_riscv64.so"
+
tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_transport_native_epoll_riscv64.so"
/>
+ <move
file="${project.build.directory}/exploded/META-INF/native/libnetty_tcnative_linux_x86_64.so"
+
tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_tcnative_linux_x86_64.so"
/>
+ <move
file="${project.build.directory}/exploded/META-INF/native/libnetty_tcnative_linux_aarch_64.so"
+
tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_tcnative_linux_aarch_64.so"
/>
+ <move
file="${project.build.directory}/exploded/META-INF/native/libnetty_tcnative_osx_x86_64.jnilib"
+
tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_tcnative_osx_x86_64.jnilib"
/>
+ <move
file="${project.build.directory}/exploded/META-INF/native/libnetty_tcnative_osx_aarch_64.jnilib"
+
tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_tcnative_osx_aarch_64.jnilib"
/>
+ <jar destfile="${shuffle.jar}"
basedir="${project.build.directory}/exploded" />
+ </target>
</configuration>
<goals>
<goal>run</goal>
diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3
b/dev/deps/spark-deps-hadoop-3-hive-2.3
index 4ee0f5a41191..71f9ac8665b0 100644
--- a/dev/deps/spark-deps-hadoop-3-hive-2.3
+++ b/dev/deps/spark-deps-hadoop-3-hive-2.3
@@ -191,16 +191,16 @@ metrics-jmx/4.2.21//metrics-jmx-4.2.21.jar
metrics-json/4.2.21//metrics-json-4.2.21.jar
metrics-jvm/4.2.21//metrics-jvm-4.2.21.jar
minlog/1.3.0//minlog-1.3.0.jar
-netty-all/4.1.100.Final//netty-all-4.1.100.Final.jar
-netty-buffer/4.1.100.Final//netty-buffer-4.1.100.Final.jar
-netty-codec-http/4.1.100.Final//netty-codec-http-4.1.100.Final.jar
-netty-codec-http2/4.1.100.Final//netty-codec-http2-4.1.100.Final.jar
-netty-codec-socks/4.1.100.Final//netty-codec-socks-4.1.100.Final.jar
-netty-codec/4.1.100.Final//netty-codec-4.1.100.Final.jar
-netty-common/4.1.100.Final//netty-common-4.1.100.Final.jar
-netty-handler-proxy/4.1.100.Final//netty-handler-proxy-4.1.100.Final.jar
-netty-handler/4.1.100.Final//netty-handler-4.1.100.Final.jar
-netty-resolver/4.1.100.Final//netty-resolver-4.1.100.Final.jar
+netty-all/4.1.106.Final//netty-all-4.1.106.Final.jar
+netty-buffer/4.1.106.Final//netty-buffer-4.1.106.Final.jar
+netty-codec-http/4.1.106.Final//netty-codec-http-4.1.106.Final.jar
+netty-codec-http2/4.1.106.Final//netty-codec-http2-4.1.106.Final.jar
+netty-codec-socks/4.1.106.Final//netty-codec-socks-4.1.106.Final.jar
+netty-codec/4.1.106.Final//netty-codec-4.1.106.Final.jar
+netty-common/4.1.106.Final//netty-common-4.1.106.Final.jar
+netty-handler-proxy/4.1.106.Final//netty-handler-proxy-4.1.106.Final.jar
+netty-handler/4.1.106.Final//netty-handler-4.1.106.Final.jar
+netty-resolver/4.1.106.Final//netty-resolver-4.1.106.Final.jar
netty-tcnative-boringssl-static/2.0.61.Final//netty-tcnative-boringssl-static-2.0.61.Final.jar
netty-tcnative-boringssl-static/2.0.61.Final/linux-aarch_64/netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar
netty-tcnative-boringssl-static/2.0.61.Final/linux-x86_64/netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar
@@ -208,14 +208,15 @@
netty-tcnative-boringssl-static/2.0.61.Final/osx-aarch_64/netty-tcnative-borings
netty-tcnative-boringssl-static/2.0.61.Final/osx-x86_64/netty-tcnative-boringssl-static-2.0.61.Final-osx-x86_64.jar
netty-tcnative-boringssl-static/2.0.61.Final/windows-x86_64/netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar
netty-tcnative-classes/2.0.61.Final//netty-tcnative-classes-2.0.61.Final.jar
-netty-transport-classes-epoll/4.1.100.Final//netty-transport-classes-epoll-4.1.100.Final.jar
-netty-transport-classes-kqueue/4.1.100.Final//netty-transport-classes-kqueue-4.1.100.Final.jar
-netty-transport-native-epoll/4.1.100.Final/linux-aarch_64/netty-transport-native-epoll-4.1.100.Final-linux-aarch_64.jar
-netty-transport-native-epoll/4.1.100.Final/linux-x86_64/netty-transport-native-epoll-4.1.100.Final-linux-x86_64.jar
-netty-transport-native-kqueue/4.1.100.Final/osx-aarch_64/netty-transport-native-kqueue-4.1.100.Final-osx-aarch_64.jar
-netty-transport-native-kqueue/4.1.100.Final/osx-x86_64/netty-transport-native-kqueue-4.1.100.Final-osx-x86_64.jar
-netty-transport-native-unix-common/4.1.100.Final//netty-transport-native-unix-common-4.1.100.Final.jar
-netty-transport/4.1.100.Final//netty-transport-4.1.100.Final.jar
+netty-transport-classes-epoll/4.1.106.Final//netty-transport-classes-epoll-4.1.106.Final.jar
+netty-transport-classes-kqueue/4.1.106.Final//netty-transport-classes-kqueue-4.1.106.Final.jar
+netty-transport-native-epoll/4.1.106.Final/linux-aarch_64/netty-transport-native-epoll-4.1.106.Final-linux-aarch_64.jar
+netty-transport-native-epoll/4.1.106.Final/linux-riscv64/netty-transport-native-epoll-4.1.106.Final-linux-riscv64.jar
+netty-transport-native-epoll/4.1.106.Final/linux-x86_64/netty-transport-native-epoll-4.1.106.Final-linux-x86_64.jar
+netty-transport-native-kqueue/4.1.106.Final/osx-aarch_64/netty-transport-native-kqueue-4.1.106.Final-osx-aarch_64.jar
+netty-transport-native-kqueue/4.1.106.Final/osx-x86_64/netty-transport-native-kqueue-4.1.106.Final-osx-x86_64.jar
+netty-transport-native-unix-common/4.1.106.Final//netty-transport-native-unix-common-4.1.106.Final.jar
+netty-transport/4.1.106.Final//netty-transport-4.1.106.Final.jar
objenesis/3.3//objenesis-3.3.jar
okhttp/3.12.12//okhttp-3.12.12.jar
okio/1.15.0//okio-1.15.0.jar
diff --git a/pom.xml b/pom.xml
index 5f33dd7d8ebc..d4e8a7db71de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -224,7 +224,7 @@
<bouncycastle.version>1.77</bouncycastle.version>
<tink.version>1.9.0</tink.version>
<datasketches.version>5.0.1</datasketches.version>
- <netty.version>4.1.100.Final</netty.version>
+ <netty.version>4.1.106.Final</netty.version>
<netty-tcnative.version>2.0.61.Final</netty-tcnative.version>
<!--
If you are changing Arrow version specification, please check
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
