[CELEBORN-1771] Bring forward PUSH_DATA_CREATE_CONNECTION_FAIL_REPLICA #2989
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
zaynt4606
changed the title
RexXiong
reviewed
Dec 13, 2024
| @@ -719,7 +720,7 @@ class PushDataHandler(val workerSource: WorkerSource) extends BaseMessageHandler | |||
| logError( | |||
| s"PushMergedData replication failed during connecting peer for partitionLocation: $location", | |||
| e) | |||
| pushMergedDataCallback.onFailure( | |||
| wrappedCallback.onFailure( | |||
There was a problem hiding this comment.
should keep pushMergedDataCallback
worker/src/main/scala/org/apache/celeborn/service/deploy/worker/PushDataHandler.scala
Outdated
Show resolved
Hide resolved
RexXiong
reviewed
Dec 16, 2024
| pushData.body().retain() | ||
| replicateThreadPool.submit(new Runnable { | ||
| override def run(): Unit = { | ||
| val peer = location.getPeer |
There was a problem hiding this comment.
Should also check unavailablePeers when run replicate task
RexXiong
approved these changes
Dec 19, 2024
| peer.getReplicatePort) | ||
| if (unavailablePeers.containsKey(peerWorker)) { | ||
| for (fileWriterIndex <- 0 until totalFileWriters) { | ||
| if (fileWriters(fileWriterIndex) != null && |
There was a problem hiding this comment.
fileWriters(fileWriterIndex) -> fileWriter
onebox-li
approved these changes
Dec 20, 2024
mridulm
reviewed
Dec 20, 2024
| if (fileWriter != null && !pushMergedDataCallback.isHardSplitPartition(fileWriterIndex)) { | ||
| fileWriter.decrementPendingWrites() | ||
| } | ||
| } |
There was a problem hiding this comment.
QQ: I am trying to understand why this is different here vs within the Runnable below ?
There was a problem hiding this comment.
To reduce the number of jobs submitted to threadpool when peerWorker is unavailable.
There was a problem hiding this comment.
fileWriter.decrementPendingWrites() here is to make up the operation in writeLocalData after the Runnable which fileWriter.incrementPendingWrites() before.
RexXiong
approved these changes
Dec 23, 2024
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?
1.Move the peerWorker available judgement out of ThreadPool.
2.Move
retainafter the available worker judgment Which means we don't have to release if peerWorker is unavailable.2. Add
fileWriter.decrementPendingWrites()if peerWorker is unavailable since it will return and won't decrementPendingWreites inwriteLocalData.Why are the changes needed?
Does this PR introduce any user-facing change?
No
How was this patch tested?
Existing UT & cluster testing.