Use UCP Listener for UCX connections and enable peer error handling #2886
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
Signed-off-by: Alessandro Bellina <abellina@nvidia.com>
abellina
force-pushed
the
shuffle/ucp_listener
branch
from
01a6431 to
f3b7e35
Compare
jlowe
reviewed
Jul 7, 2021
sql-plugin/src/main/scala/org/apache/spark/sql/rapids/GpuShuffleEnv.scala
Show resolved
Hide resolved
tests/src/test/scala/com/nvidia/spark/rapids/shuffle/RapidsShuffleClientSuite.scala
Outdated
Show resolved
Hide resolved
tests/src/test/scala/com/nvidia/spark/rapids/shuffle/RapidsShuffleServerSuite.scala
Outdated
Show resolved
Hide resolved
tests/src/test/scala/com/nvidia/spark/rapids/shuffle/RapidsShuffleTestHelper.scala
Outdated
Show resolved
Hide resolved
sql-plugin/src/main/scala/com/nvidia/spark/rapids/shuffle/RapidsShuffleServer.scala
Show resolved
Hide resolved
shuffle-plugin/src/main/scala/com/nvidia/spark/rapids/shuffle/ucx/UCX.scala
Show resolved
Hide resolved
shuffle-plugin/src/main/scala/com/nvidia/spark/rapids/shuffle/ucx/UCX.scala
Show resolved
Hide resolved
shuffle-plugin/src/main/scala/com/nvidia/spark/rapids/shuffle/ucx/UCXConnection.scala
Outdated
Show resolved
Hide resolved
tests/src/test/scala/com/nvidia/spark/rapids/shuffle/RapidsShuffleClientSuite.scala
Show resolved
Hide resolved
sql-plugin/src/main/scala/com/nvidia/spark/rapids/shuffle/RapidsShuffleClient.scala
Show resolved
Hide resolved
gerashegalov
reviewed
Jul 8, 2021
shuffle-plugin/src/main/scala/com/nvidia/spark/rapids/shuffle/ucx/UCXConnection.scala
Outdated
Show resolved
Hide resolved
shuffle-plugin/src/main/scala/com/nvidia/spark/rapids/shuffle/ucx/UCX.scala
Outdated
Show resolved
Hide resolved
Signed-off-by: Alessandro Bellina <abellina@nvidia.com>
jlowe
reviewed
Jul 8, 2021
tests/src/test/scala/com/nvidia/spark/rapids/shuffle/RapidsShuffleClientSuite.scala
Outdated
Show resolved
Hide resolved
shuffle-plugin/src/main/scala/com/nvidia/spark/rapids/shuffle/ucx/UCX.scala
Show resolved
Hide resolved
gerashegalov
reviewed
Jul 9, 2021
| hsBuff.putInt(localExecutorId) | ||
|
|
||
| def packHandshake(localExecutorId: Long, rkeys: Seq[ByteBuffer]): ByteBuffer = { | ||
| val size = 8 + 4 + (4 * rkeys.size) + rkeys.map(_.capacity).sum |
There was a problem hiding this comment.
nit: could use JDK constants java.lang.Long.BYTES + java.lang.Integer.BYTES for 8 + 4
sql-plugin/src/main/scala/com/nvidia/spark/rapids/shuffle/RapidsShuffleTransport.scala
Show resolved
Hide resolved
jlowe
previously approved these changes
Jul 9, 2021
|
I'll make the |
|
build |
jlowe
reviewed
Jul 9, 2021
sql-plugin/src/main/scala/com/nvidia/spark/rapids/shuffle/RapidsShuffleServer.scala
Show resolved
Hide resolved
jlowe
approved these changes
Jul 9, 2021
|
build |
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.
Closes #1590
Closes #2275
Closes #737
Created this as a draft because I may add more unit tests. But I could use some feedback on the patch. (I can't think of ways of adding tests without refactoring
UCX.scala, so I am going to hold off).This switches to use
UCPListeneras our incoming connection port, and enables peer error handling by default.With this change, if a peer terminates the following is expected (@petro-rudenko please confirm):
onErrorcallback for each of the pending live requests.Because of how UCX works right now, a failing endpoint may or may not be of interest. We make an attempt to not initiate endpoints if we detect that we already had an endpoint created due to a peer initiating against us, but this is a race condition and in this PR we simply make one of those two endpoints win and be the default, while the other sticks around.
In the future: openucx/ucx#6859, we'll be able to better detect this (earlier) and reject certain requests.
@jlowe @petro-rudenko