Skip to content

[SPARK-53849][BUILD] Upgrade Netty to 4.2.6.Final #52552

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
wants to merge 1 commit into from
+46 −23
Closed

[SPARK-53849][BUILD] Upgrade Netty to 4.2.6.Final #52552

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
4 changes: 3 additions & 1 deletion ...ork-common/src/test/java/org/apache/spark/network/client/TransportClientFactorySuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,11 +225,12 @@ public void closeFactoryBeforeCreateClient() {
}

@Test
public void fastFailConnectionInTimeWindow() {
public void fastFailConnectionInTimeWindow() throws IOException, InterruptedException {
TransportClientFactory factory = context.createClientFactory();
TransportServer server = context.createServer();
int unreachablePort = server.getPort();
server.close();
Thread.sleep(1000);
Assertions.assertThrows(IOException.class,
() -> factory.createClient(TestUtils.getLocalHost(), unreachablePort, true));
Assertions.assertThrows(IOException.class,
Expand Down Expand Up @@ -258,6 +259,7 @@ public void unlimitedConnectionAndCreationTimeouts() throws IOException, Interru
TransportServer server = ctx.createServer();
int unreachablePort = server.getPort();
JavaUtils.closeQuietly(server);
Thread.sleep(1000);
IOException exception = Assertions.assertThrows(IOException.class,
() -> factory.createClient(TestUtils.getLocalHost(), unreachablePort, true));
assertNotEquals(exception.getCause(), null);
Expand Down
57 changes: 36 additions & 21 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 @@ -198,33 +198,48 @@ metrics-jmx/4.2.33//metrics-jmx-4.2.33.jar
metrics-json/4.2.33//metrics-json-4.2.33.jar
metrics-jvm/4.2.33//metrics-jvm-4.2.33.jar
minlog/1.3.0//minlog-1.3.0.jar
netty-all/4.1.127.Final//netty-all-4.1.127.Final.jar
netty-buffer/4.1.127.Final//netty-buffer-4.1.127.Final.jar
netty-codec-dns/4.1.127.Final//netty-codec-dns-4.1.127.Final.jar
netty-codec-http/4.1.127.Final//netty-codec-http-4.1.127.Final.jar
netty-codec-http2/4.1.127.Final//netty-codec-http2-4.1.127.Final.jar
netty-codec-socks/4.1.127.Final//netty-codec-socks-4.1.127.Final.jar
netty-codec/4.1.127.Final//netty-codec-4.1.127.Final.jar
netty-common/4.1.127.Final//netty-common-4.1.127.Final.jar
netty-handler-proxy/4.1.127.Final//netty-handler-proxy-4.1.127.Final.jar
netty-handler/4.1.127.Final//netty-handler-4.1.127.Final.jar
netty-resolver-dns/4.1.127.Final//netty-resolver-dns-4.1.127.Final.jar
netty-resolver/4.1.127.Final//netty-resolver-4.1.127.Final.jar
netty-all/4.2.6.Final//netty-all-4.2.6.Final.jar
netty-buffer/4.2.6.Final//netty-buffer-4.2.6.Final.jar
netty-codec-base/4.2.6.Final//netty-codec-base-4.2.6.Final.jar
netty-codec-classes-quic/4.2.6.Final//netty-codec-classes-quic-4.2.6.Final.jar
netty-codec-compression/4.2.6.Final//netty-codec-compression-4.2.6.Final.jar
netty-codec-dns/4.2.6.Final//netty-codec-dns-4.2.6.Final.jar
netty-codec-http/4.2.6.Final//netty-codec-http-4.2.6.Final.jar
netty-codec-http2/4.2.6.Final//netty-codec-http2-4.2.6.Final.jar
netty-codec-http3/4.2.6.Final//netty-codec-http3-4.2.6.Final.jar
netty-codec-marshalling/4.2.6.Final//netty-codec-marshalling-4.2.6.Final.jar
netty-codec-native-quic/4.2.6.Final/linux-aarch_64/netty-codec-native-quic-4.2.6.Final-linux-aarch_64.jar
netty-codec-native-quic/4.2.6.Final/linux-x86_64/netty-codec-native-quic-4.2.6.Final-linux-x86_64.jar
netty-codec-native-quic/4.2.6.Final/osx-aarch_64/netty-codec-native-quic-4.2.6.Final-osx-aarch_64.jar
netty-codec-native-quic/4.2.6.Final/osx-x86_64/netty-codec-native-quic-4.2.6.Final-osx-x86_64.jar
netty-codec-native-quic/4.2.6.Final/windows-x86_64/netty-codec-native-quic-4.2.6.Final-windows-x86_64.jar
netty-codec-protobuf/4.2.6.Final//netty-codec-protobuf-4.2.6.Final.jar
netty-codec-socks/4.2.6.Final//netty-codec-socks-4.2.6.Final.jar
netty-codec/4.2.6.Final//netty-codec-4.2.6.Final.jar
netty-common/4.2.6.Final//netty-common-4.2.6.Final.jar
netty-handler-proxy/4.2.6.Final//netty-handler-proxy-4.2.6.Final.jar
netty-handler/4.2.6.Final//netty-handler-4.2.6.Final.jar
netty-resolver-dns/4.2.6.Final//netty-resolver-dns-4.2.6.Final.jar
netty-resolver/4.2.6.Final//netty-resolver-4.2.6.Final.jar
netty-tcnative-boringssl-static/2.0.74.Final/linux-aarch_64/netty-tcnative-boringssl-static-2.0.74.Final-linux-aarch_64.jar
netty-tcnative-boringssl-static/2.0.74.Final/linux-x86_64/netty-tcnative-boringssl-static-2.0.74.Final-linux-x86_64.jar
netty-tcnative-boringssl-static/2.0.74.Final/osx-aarch_64/netty-tcnative-boringssl-static-2.0.74.Final-osx-aarch_64.jar
netty-tcnative-boringssl-static/2.0.74.Final/osx-x86_64/netty-tcnative-boringssl-static-2.0.74.Final-osx-x86_64.jar
netty-tcnative-boringssl-static/2.0.74.Final/windows-x86_64/netty-tcnative-boringssl-static-2.0.74.Final-windows-x86_64.jar
netty-tcnative-classes/2.0.74.Final//netty-tcnative-classes-2.0.74.Final.jar
netty-transport-classes-epoll/4.1.127.Final//netty-transport-classes-epoll-4.1.127.Final.jar
netty-transport-classes-kqueue/4.1.127.Final//netty-transport-classes-kqueue-4.1.127.Final.jar
netty-transport-native-epoll/4.1.127.Final/linux-aarch_64/netty-transport-native-epoll-4.1.127.Final-linux-aarch_64.jar
netty-transport-native-epoll/4.1.127.Final/linux-riscv64/netty-transport-native-epoll-4.1.127.Final-linux-riscv64.jar
netty-transport-native-epoll/4.1.127.Final/linux-x86_64/netty-transport-native-epoll-4.1.127.Final-linux-x86_64.jar
netty-transport-native-kqueue/4.1.127.Final/osx-aarch_64/netty-transport-native-kqueue-4.1.127.Final-osx-aarch_64.jar
netty-transport-native-kqueue/4.1.127.Final/osx-x86_64/netty-transport-native-kqueue-4.1.127.Final-osx-x86_64.jar
netty-transport-native-unix-common/4.1.127.Final//netty-transport-native-unix-common-4.1.127.Final.jar
netty-transport/4.1.127.Final//netty-transport-4.1.127.Final.jar
netty-transport-classes-epoll/4.2.6.Final//netty-transport-classes-epoll-4.2.6.Final.jar
netty-transport-classes-io_uring/4.2.6.Final//netty-transport-classes-io_uring-4.2.6.Final.jar
netty-transport-classes-kqueue/4.2.6.Final//netty-transport-classes-kqueue-4.2.6.Final.jar
netty-transport-native-epoll/4.2.6.Final/linux-aarch_64/netty-transport-native-epoll-4.2.6.Final-linux-aarch_64.jar
netty-transport-native-epoll/4.2.6.Final/linux-riscv64/netty-transport-native-epoll-4.2.6.Final-linux-riscv64.jar
netty-transport-native-epoll/4.2.6.Final/linux-x86_64/netty-transport-native-epoll-4.2.6.Final-linux-x86_64.jar
netty-transport-native-io_uring/4.2.6.Final/linux-aarch_64/netty-transport-native-io_uring-4.2.6.Final-linux-aarch_64.jar
netty-transport-native-io_uring/4.2.6.Final/linux-riscv64/netty-transport-native-io_uring-4.2.6.Final-linux-riscv64.jar
netty-transport-native-io_uring/4.2.6.Final/linux-x86_64/netty-transport-native-io_uring-4.2.6.Final-linux-x86_64.jar
netty-transport-native-kqueue/4.2.6.Final/osx-aarch_64/netty-transport-native-kqueue-4.2.6.Final-osx-aarch_64.jar
netty-transport-native-kqueue/4.2.6.Final/osx-x86_64/netty-transport-native-kqueue-4.2.6.Final-osx-x86_64.jar
netty-transport-native-unix-common/4.2.6.Final//netty-transport-native-unix-common-4.2.6.Final.jar
netty-transport/4.2.6.Final//netty-transport-4.2.6.Final.jar
objenesis/3.4//objenesis-3.4.jar
okhttp/3.12.12//okhttp-3.12.12.jar
okio/1.17.6//okio-1.17.6.jar
Expand Down
2 changes: 2 additions & 0 deletions launcher/src/main/java/org/apache/spark/launcher/JavaModuleOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ public class JavaModuleOptions {
"--add-opens=java.security.jgss/sun.security.krb5=ALL-UNNAMED",
"-Djdk.reflect.useDirectMethodHandle=false",
"-Dio.netty.tryReflectionSetAccessible=true",
"-Dio.netty.allocator.type=pooled",
"-Dio.netty.handler.ssl.defaultEndpointVerificationAlgorithm=NONE",
"--enable-native-access=ALL-UNNAMED"};

/**
Expand Down
4 changes: 3 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@
<bouncycastle.version>1.82</bouncycastle.version>
<tink.version>1.16.0</tink.version>
<datasketches.version>6.2.0</datasketches.version>
<netty.version>4.1.127.Final</netty.version>
<netty.version>4.2.6.Final</netty.version>
<netty-tcnative.version>2.0.74.Final</netty-tcnative.version>
<icu4j.version>77.1</icu4j.version>
<junit-jupiter.version>5.13.4</junit-jupiter.version>
Expand Down Expand Up @@ -337,6 +337,8 @@
--add-opens=java.base/sun.util.calendar=ALL-UNNAMED
-Djdk.reflect.useDirectMethodHandle=false
-Dio.netty.tryReflectionSetAccessible=true
-Dio.netty.allocator.type=pooled
-Dio.netty.handler.ssl.defaultEndpointVerificationAlgorithm=NONE
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I understand these changes are for keeping behavior like Netty 4.1 and before as the migration guides indicates.
https://github.com/netty/netty/wiki/Netty-4.2-Migration-Guide

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, correct. Thank you, @sarutak .

--enable-native-access=ALL-UNNAMED
</extraJavaTestArgs>
<mariadb.java.client.version>2.7.12</mariadb.java.client.version>
Expand Down
2 changes: 2 additions & 0 deletions project/SparkBuild.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1704,6 +1704,8 @@ object TestSettings {
"--add-opens=java.base/sun.util.calendar=ALL-UNNAMED",
"-Djdk.reflect.useDirectMethodHandle=false",
"-Dio.netty.tryReflectionSetAccessible=true",
"-Dio.netty.allocator.type=pooled",
"-Dio.netty.handler.ssl.defaultEndpointVerificationAlgorithm=NONE",
"--enable-native-access=ALL-UNNAMED").mkString(" ")
s"-Xmx$heapSize -Xss4m -XX:MaxMetaspaceSize=$metaspaceSize -XX:ReservedCodeCacheSize=128m -Dfile.encoding=UTF-8 $extraTestJavaArgs"
.split(" ").toSeq
Expand Down