-
Notifications
You must be signed in to change notification settings - Fork 28.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[SPARK-8430]ExternalShuffleBlockResolver of shuffle service should support UnsafeShuffleManager #6873
Conversation
Test build #35108 has finished for PR 6873 at commit
|
Ah, interesting: I purposely made sure that the on-disk format would be compatible with the format used by the SortShuffleManager, but I guess I overlooked this. @andrewor14, the fact that tests didn't catch this suggests that we're not testing many combinations of shuffle managers + external shuffle service. Do you want to open some followup JIRAs / tasks to improve coverage here as part of separate PRs? |
Jenkins, retest this please. |
@@ -110,6 +110,9 @@ public ManagedBuffer getBlockData(String appId, String execId, String blockId) { | |||
return getHashBasedShuffleBlockData(executor, blockId); | |||
} else if ("org.apache.spark.shuffle.sort.SortShuffleManager".equals(executor.shuffleManager)) { | |||
return getSortBasedShuffleBlockData(executor, shuffleId, mapId, reduceId); | |||
} else if ("org.apache.spark.shuffle.unsafe.UnsafeShuffleManager".equals( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this could just be merged with the previous case:
} else if ("org.apache.spark.shuffle.sort.SortShuffleManager".equals(executor.shuffleManager) ||
"org.apache.spark.shuffle.unsafe.UnsafeShuffleManager".equals(executor.shuffleManager)) {
return getSortBasedShuffleBlockData(...);
}
Ok, I filed https://issues.apache.org/jira/browse/SPARK-8447. |
@JoshRosen is this fix sufficient in fixing the issue? |
Also, @lianhuiwang would you mind updating the title of the PR to exclude references to YARN? This is not a YARN issue, but rather an external shuffle service issue in general. |
@andrewor14, yep, this fix looks good to me. |
Test build #35143 has finished for PR 6873 at commit
|
@andrewor14 @JoshRosen now i have tested unsafeShuffleManger on yarn's external shuffle service and that's ok because now file structures of unsafeManger's shuffle are same as sortShuffleManger. |
@lianhuiwang SGTM. I'll merge this after it passes tests. |
@JoshRosen thanks. |
Test build #35204 has finished for PR 6873 at commit
|
@lianhuiwang, I think this is ready to merge, but do you mind addressing @andrewor14's comment about the title first? The external shuffle service isn't only for use in YARN, so we shouldn't include YARN in the PR title (which becomes the commit title unless I manually fix it up myself on merge). |
@JoshRosen yes, i have update PR's title and removed words about yarn. thanks. |
Ok, merging into master 1.4 |
…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]>
…upport UnsafeShuffleManager andrewor14 can you take a look?thanks Author: Lianhui Wang <[email protected]> Closes apache#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]>
@andrewor14 can you take a look?thanks