[#719] feat(netty): Optimize allocation strategy #739
Merged
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
Codecov Report
@@ Coverage Diff @@
## master #739 +/- ##
============================================
+ Coverage 60.73% 62.81% +2.07%
- Complexity 1859 1898 +39
============================================
Files 231 224 -7
Lines 12857 11049 -1808
Branches 1071 1091 +20
============================================
- Hits 7809 6940 -869
+ Misses 4633 3732 -901
+ Partials 415 377 -38
... and 23 files with indirect coverage changes 📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
jerqi
reviewed
Mar 18, 2023
server/src/main/java/org/apache/uniffle/server/ShuffleServer.java
Outdated
Show resolved
Hide resolved
jerqi
reviewed
Mar 18, 2023
client-spark/spark3/src/main/java/org/apache/spark/shuffle/RssShuffleManager.java
Outdated
Show resolved
Hide resolved
jerqi
reviewed
Mar 18, 2023
server/src/main/java/org/apache/uniffle/server/ShuffleServerConf.java
Outdated
Show resolved
Hide resolved
smallzhongfeng
commented
Mar 18, 2023
| CoordinatorTestUtils.waitForRegister(coordinatorClient,2); | ||
| // When the shuffleServerHeartbeat Test is completed before the current test, |
There was a problem hiding this comment.
Because this
shuffleServerConf modifies the netty port number of a server, there will be one less machine allocated. Therefore, in order to maintain the original test, we need to set the port number back to a negative number, which is equivalent to setting the label to GRPC.
integration-test/common/src/test/java/org/apache/uniffle/test/CoordinatorGrpcTest.java
Outdated
Show resolved
Hide resolved
advancedxy
reviewed
Mar 19, 2023
| @@ -130,6 +131,11 @@ public static void main(String[] args) { | |||
| assignmentTags.addAll(Arrays.asList(rawTags.split(","))); | |||
| } | |||
| assignmentTags.add(Constants.SHUFFLE_SERVER_VERSION); | |||
| if (ClientType.GRPC_NETTY.name().equals(conf.get(RssMRConfig.RSS_CLIENT_TYPE))) { | |||
There was a problem hiding this comment.
Could we also add a conf validator for RSS_CLIENT_TYPE here?
Then I think we can simply call assignmentTags.add(conf.get(RssMRConfig.RSS_CLIENT_TYPE)) here?
added 2 commits
March 20, 2023 11:33
jerqi
reviewed
Mar 20, 2023
common/src/main/java/org/apache/uniffle/common/config/RssConf.java
Outdated
Show resolved
Hide resolved
| @@ -122,4 +126,11 @@ public static void validateTestModeConf(boolean testMode, String storageType) { | |||
| + "because of the poor performance of these two types."); | |||
| } | |||
| } | |||
|
|
|||
| public static void validateClientType(String clientType) { | |||
There was a problem hiding this comment.
Could we convert this method to CheckValue#checkValueFunc like ConfigUtil#POSITIVE_LONG_VALIDATOR?
There was a problem hiding this comment.
OK, i will try it.
There was a problem hiding this comment.
It doesn't seem to work because there is no checkValue on mr's client side.
jerqi
reviewed
Mar 20, 2023
| Field field = clazz.getDeclaredField("settings"); | ||
| field.setAccessible(true); | ||
| originConf.remove(ShuffleServerConf.NETTY_SERVER_PORT.key()); | ||
| field.set(shuffleServerConf, originConf); |
There was a problem hiding this comment.
We don't need set the value again. They are the same object.
added 2 commits
March 20, 2023 16:25
jerqi
approved these changes
Mar 20, 2023
|
Thanks for your review! @jerqi @advancedxy |
advancedxy
pushed a commit
to advancedxy/incubator-uniffle
that referenced
this pull request
Mar 21, 2023
### What changes were proposed in this pull request? Users can choose to use netty's transmission method or grpc's through client configuration. ### Why are the changes needed? Fix: apache#719 ### Does this PR introduce _any_ user-facing change? No. However, if users want to use `netty` as a data transfer method, they need to enable `spark.rss.client.type=GRPC_ NETTY` or `mapreduce.rss.client.type=GRPC_ NETTY` ### How was this patch tested? New uts.
xianjingfeng
pushed a commit
to xianjingfeng/incubator-uniffle
that referenced
this pull request
Apr 5, 2023
### What changes were proposed in this pull request? Users can choose to use netty's transmission method or grpc's through client configuration. ### Why are the changes needed? Fix: apache#719 ### Does this PR introduce _any_ user-facing change? No. However, if users want to use `netty` as a data transfer method, they need to enable `spark.rss.client.type=GRPC_ NETTY` or `mapreduce.rss.client.type=GRPC_ NETTY` ### How was this patch tested? New uts.
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?
Users can choose to use netty's transmission method or grpc's through client configuration.
Why are the changes needed?
Fix: #719
Does this PR introduce any user-facing change?
No. However, if users want to use
nettyas a data transfer method, they need to enablespark.rss.client.type=GRPC_ NETTYormapreduce.rss.client.type=GRPC_ NETTYHow was this patch tested?
New uts.