-
Notifications
You must be signed in to change notification settings - Fork 28.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[SPARK-32915][CORE] Network-layer and shuffle RPC layer changes to su…
…pport push shuffle blocks ### What changes were proposed in this pull request? This is the first patch for SPIP SPARK-30602 for push-based shuffle. Summary of changes: * Introduce new API in ExternalBlockStoreClient to push blocks to a remote shuffle service. * Leveraging the streaming upload functionality in SPARK-6237, it also enables the ExternalBlockHandler to delegate the handling of block push requests to MergedShuffleFileManager. * Propose the API for MergedShuffleFileManager, where the core logic on the shuffle service side to handle block push requests is defined. The actual implementation of this API is deferred into a later RB to restrict the size of this PR. * Introduce OneForOneBlockPusher to enable pushing blocks to remote shuffle services in shuffle RPC layer. * New protocols in shuffle RPC layer to support the functionalities. ### Why are the changes needed? Refer to the SPIP in SPARK-30602 ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Added unit tests. The reference PR with the consolidated changes covering the complete implementation is also provided in SPARK-30602. We have already verified the functionality and the improved performance as documented in the SPIP doc. Lead-authored-by: Min Shen <mshenlinkedin.com> Co-authored-by: Chandni Singh <chsinghlinkedin.com> Co-authored-by: Ye Zhou <yezhoulinkedin.com> Closes #29855 from Victsm/SPARK-32915. Lead-authored-by: Min Shen <mshen@linkedin.com> Co-authored-by: Chandni Singh <chsingh@linkedin.com> Co-authored-by: Ye Zhou <yezhou@linkedin.com> Co-authored-by: Chandni Singh <singh.chandni@gmail.com> Co-authored-by: Min Shen <victor.nju@gmail.com> Signed-off-by: Mridul Muralidharan <mridul<at>gmail.com>
- Loading branch information
1 parent
b089fe5
commit 82eea13
Showing
21 changed files
with
1,212 additions
and
15 deletions.
There are no files selected for viewing
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 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 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 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
85 changes: 85 additions & 0 deletions
85
common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/ErrorHandler.java
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.apache.spark.network.shuffle; | ||
|
||
import java.net.ConnectException; | ||
|
||
import com.google.common.base.Throwables; | ||
|
||
/** | ||
* Plugs into {@link RetryingBlockFetcher} to further control when an exception should be retried | ||
* and logged. | ||
* Note: {@link RetryingBlockFetcher} will delegate the exception to this handler only when | ||
* - remaining retries < max retries | ||
* - exception is an IOException | ||
*/ | ||
|
||
public interface ErrorHandler { | ||
|
||
boolean shouldRetryError(Throwable t); | ||
|
||
default boolean shouldLogError(Throwable t) { | ||
return true; | ||
} | ||
|
||
/** | ||
* A no-op error handler instance. | ||
*/ | ||
ErrorHandler NOOP_ERROR_HANDLER = t -> true; | ||
|
||
/** | ||
* The error handler for pushing shuffle blocks to remote shuffle services. | ||
*/ | ||
class BlockPushErrorHandler implements ErrorHandler { | ||
/** | ||
* String constant used for generating exception messages indicating a block to be merged | ||
* arrives too late on the server side, and also for later checking such exceptions on the | ||
* client side. When we get a block push failure because of the block arrives too late, we | ||
* will not retry pushing the block nor log the exception on the client side. | ||
*/ | ||
public static final String TOO_LATE_MESSAGE_SUFFIX = | ||
"received after merged shuffle is finalized"; | ||
|
||
/** | ||
* String constant used for generating exception messages indicating the server couldn't | ||
* append a block after all available attempts due to collision with other blocks belonging | ||
* to the same shuffle partition, and also for later checking such exceptions on the client | ||
* side. When we get a block push failure because of the block couldn't be written due to | ||
* this reason, we will not log the exception on the client side. | ||
*/ | ||
public static final String BLOCK_APPEND_COLLISION_DETECTED_MSG_PREFIX = | ||
"Couldn't find an opportunity to write block"; | ||
|
||
@Override | ||
public boolean shouldRetryError(Throwable t) { | ||
// If it is a connection time out or a connection closed exception, no need to retry. | ||
if (t.getCause() != null && t.getCause() instanceof ConnectException) { | ||
return false; | ||
} | ||
// If the block is too late, there is no need to retry it | ||
return !Throwables.getStackTraceAsString(t).contains(TOO_LATE_MESSAGE_SUFFIX); | ||
} | ||
|
||
@Override | ||
public boolean shouldLogError(Throwable t) { | ||
String errorStackTrace = Throwables.getStackTraceAsString(t); | ||
return !errorStackTrace.contains(BLOCK_APPEND_COLLISION_DETECTED_MSG_PREFIX) && | ||
!errorStackTrace.contains(TOO_LATE_MESSAGE_SUFFIX); | ||
} | ||
} | ||
} |
Oops, something went wrong.