[SPARK-8430] ExternalShuffleBlockResolver of shuffle service should s…

…upport 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 (cherry picked from commit 9baf093) Signed-off-by: Andrew Or <[email protected]>
apache · Jun 19, 2015 · 6f2e411 · 6f2e411
1 parent 1f2dafb
commit 6f2e411
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.../shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleBlockResolver.java b/.../shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleBlockResolver.java
@@ -108,7 +108,8 @@ public ManagedBuffer getBlockData(String appId, String execId, String blockId) {
 
     if ("org.apache.spark.shuffle.hash.HashShuffleManager".equals(executor.shuffleManager)) {
       return getHashBasedShuffleBlockData(executor, blockId);
-    } else if ("org.apache.spark.shuffle.sort.SortShuffleManager".equals(executor.shuffleManager)) {
+    } else if ("org.apache.spark.shuffle.sort.SortShuffleManager".equals(executor.shuffleManager)
+      || "org.apache.spark.shuffle.unsafe.UnsafeShuffleManager".equals(executor.shuffleManager)) {
       return getSortBasedShuffleBlockData(executor, shuffleId, mapId, reduceId);
     } else {
       throw new UnsupportedOperationException(