Skip to content

Commit 9baf093

Browse files
lianhuiwangAndrew Or
authored andcommitted
[SPARK-8430] ExternalShuffleBlockResolver of shuffle service should support UnsafeShuffleManager
andrewor14 can you take a look?thanks Author: Lianhui Wang <[email protected]> Closes #6873 from lianhuiwang/SPARK-8430 and squashes the following commits: 51c47ca [Lianhui Wang] update andrewor's comments 2b27b19 [Lianhui Wang] support UnsafeShuffleManager
1 parent 2c59d5c commit 9baf093

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

network/shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleBlockResolver.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,8 @@ public ManagedBuffer getBlockData(String appId, String execId, String blockId) {
108108

109109
if ("org.apache.spark.shuffle.hash.HashShuffleManager".equals(executor.shuffleManager)) {
110110
return getHashBasedShuffleBlockData(executor, blockId);
111-
} else if ("org.apache.spark.shuffle.sort.SortShuffleManager".equals(executor.shuffleManager)) {
111+
} else if ("org.apache.spark.shuffle.sort.SortShuffleManager".equals(executor.shuffleManager)
112+
|| "org.apache.spark.shuffle.unsafe.UnsafeShuffleManager".equals(executor.shuffleManager)) {
112113
return getSortBasedShuffleBlockData(executor, shuffleId, mapId, reduceId);
113114
} else {
114115
throw new UnsupportedOperationException(

0 commit comments

Comments
 (0)