[SPARK-40718][CONNECT] Replace grpc-netty-shaded withgrpc-netty
#38179
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This patch replaces the shaded version of Netty in GRPC with the unshaded one since we're shading the result again and want to avoid double shaded package names.
HyukjinKwon
approved these changes
Oct 9, 2022
|
Have you considered the native libraries? they should be relocated as well |
|
cc @LuciferYang, as you are working on #38162 |
LuciferYang
approved these changes
Oct 9, 2022
|
Can one of the admins verify this patch? |
dongjoon-hyun
approved these changes
Oct 9, 2022
dongjoon-hyun
changed the title
grpc-netty-shaded withgrpc-netty.grpc-netty-shaded withgrpc-netty
amaliujia
approved these changes
Oct 9, 2022
|
Merged to master. Thank you all. |
|
@grundprinzip Sorry to bother you, but I found after this pr Spark will deps 2 versions of netty, 4.1.80 and 4.1.72 |
|
We use |
|
The netty jars that grpc depends on have been explicitly excluded by Spark, because Spark does not need them before.
@dongjoon-hyun Which way do you prefer? I will submit a pr to solve this issue.
|
HyukjinKwon
pushed a commit
to HyukjinKwon/spark
that referenced
this pull request
Oct 10, 2022
…dependencies for the `connect` module ### What changes were proposed in this pull request? After apache#38179, there are 2 netty version in Spark: - 4.1.72 for `connect` module - 4.1.80 for other modules So this pr explicitly add netty related dependencies for the `connect` module to ensure Spark use unified netty version. ### Why are the changes needed? Ensure Spark use unified netty version. ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? - Pass GitHub Actions - Manual test： run `mvn dependency:tree -pl connector/connect | grep netty` Before ``` [INFO] | +- io.netty:netty-all:jar:4.1.80.Final:provided [INFO] | | +- io.netty:netty-buffer:jar:4.1.80.Final:compile [INFO] | | +- io.netty:netty-codec:jar:4.1.80.Final:compile [INFO] | | +- io.netty:netty-common:jar:4.1.80.Final:compile [INFO] | | +- io.netty:netty-handler:jar:4.1.80.Final:compile [INFO] | | +- io.netty:netty-resolver:jar:4.1.80.Final:provided [INFO] | | +- io.netty:netty-transport:jar:4.1.80.Final:compile [INFO] | | +- io.netty:netty-transport-classes-epoll:jar:4.1.80.Final:provided [INFO] | | \- io.netty:netty-transport-classes-kqueue:jar:4.1.80.Final:provided [INFO] | +- io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.80.Final:provided [INFO] | +- io.netty:netty-transport-native-epoll:jar:linux-aarch_64:4.1.80.Final:provided [INFO] | +- io.netty:netty-transport-native-kqueue:jar:osx-aarch_64:4.1.80.Final:provided [INFO] | +- io.netty:netty-transport-native-kqueue:jar:osx-x86_64:4.1.80.Final:provided [INFO] | +- io.netty:netty-tcnative-classes:jar:2.0.54.Final:provided [INFO] | \- org.apache.arrow:arrow-memory-netty:jar:9.0.0:provided [INFO] +- io.grpc:grpc-netty:jar:1.47.0:compile [INFO] | +- io.netty:netty-codec-http2:jar:4.1.72.Final:compile [INFO] | | \- io.netty:netty-codec-http:jar:4.1.72.Final:compile [INFO] | +- io.netty:netty-handler-proxy:jar:4.1.72.Final:runtime [INFO] | | \- io.netty:netty-codec-socks:jar:4.1.72.Final:runtime [INFO] | \- io.netty:netty-transport-native-unix-common:jar:4.1.72.Final:runtime ``` After ``` [INFO] | +- io.netty:netty-all:jar:4.1.80.Final:provided [INFO] | | +- io.netty:netty-resolver:jar:4.1.80.Final:provided [INFO] | | +- io.netty:netty-transport-classes-epoll:jar:4.1.80.Final:provided [INFO] | | \- io.netty:netty-transport-classes-kqueue:jar:4.1.80.Final:provided [INFO] | +- io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.80.Final:provided [INFO] | +- io.netty:netty-transport-native-epoll:jar:linux-aarch_64:4.1.80.Final:provided [INFO] | +- io.netty:netty-transport-native-kqueue:jar:osx-aarch_64:4.1.80.Final:provided [INFO] | +- io.netty:netty-transport-native-kqueue:jar:osx-x86_64:4.1.80.Final:provided [INFO] | +- io.netty:netty-tcnative-classes:jar:2.0.54.Final:provided [INFO] | \- org.apache.arrow:arrow-memory-netty:jar:9.0.0:provided [INFO] +- io.grpc:grpc-netty:jar:1.47.0:compile [INFO] +- io.netty:netty-codec-http2:jar:4.1.80.Final:provided [INFO] | +- io.netty:netty-common:jar:4.1.80.Final:provided [INFO] | +- io.netty:netty-buffer:jar:4.1.80.Final:provided [INFO] | +- io.netty:netty-transport:jar:4.1.80.Final:provided [INFO] | +- io.netty:netty-codec:jar:4.1.80.Final:provided [INFO] | +- io.netty:netty-handler:jar:4.1.80.Final:provided [INFO] | \- io.netty:netty-codec-http:jar:4.1.80.Final:provided [INFO] +- io.netty:netty-handler-proxy:jar:4.1.80.Final:provided [INFO] | \- io.netty:netty-codec-socks:jar:4.1.80.Final:provided [INFO] +- io.netty:netty-transport-native-unix-common:jar:4.1.80.Final:provided ``` Closes apache#38185 from LuciferYang/SPARK-40718-FOLLOWUP. Authored-by: yangjie01 <yangjie01@baidu.com> Signed-off-by: Hyukjin Kwon <gurwls223@apache.org>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
This patch replaces the shaded version of Netty in GRPC with the unshaded one since we're shading the result again and want to avoid double shaded package names.
Why are the changes needed?
Unnecessary double shaded package names.
Does this PR introduce any user-facing change?
No
How was this patch tested?
Existing tests will check for compilation break.