Skip to content

[SPARK-10004] [shuffle] Perform auth checks when clients read shuffle data. #8218

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.

Sign up for GitHub

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

Closed
vanzin wants to merge 9 commits into from
Closed

[SPARK-10004] [shuffle] Perform auth checks when clients read shuffle data. #8218

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
17eb187
[SPARK-10004] [shuffle] Perform auth checks when clients read shuffle…
Aug 14, 2015
c68deab
Unblock jenkins build (mima check failed).
Aug 15, 2015
292a299
Feedback + fix a test that was failing to fail.
Aug 17, 2015
fadff27
Clean imports.
Aug 17, 2015
3cc9321
Merge branch 'master' into SPARK-10004
Aug 18, 2015
4d19ed5
Better error messages when tests fail.
Aug 20, 2015
8153497
Merge branch 'master' into SPARK-10004
Aug 21, 2015
d25c6cf
Merge branch 'master' into SPARK-10004
Aug 25, 2015
b491ac7
Make clientId @Nullable.
Aug 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into SPARK-10004 
Conflicts:
	core/src/main/scala/org/apache/spark/network/netty/NettyBlockRpcServer.scala
  • Loading branch information
Marcelo Vanzin committed Aug 25, 2015
commit d25c6cf93566d70a9d4c811044cfe41c98a8f273
2 changes: 1 addition & 1 deletion core/src/main/scala/org/apache/spark/network/netty/NettyBlockRpcServer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class NettyBlockRpcServer(
case openBlocks: OpenBlocks =>
val blocks: Seq[ManagedBuffer] =
openBlocks.blockIds.map(BlockId.apply).map(blockManager.getBlockData)
val streamId = streamManager.registerStream(appId, blocks.iterator)
val streamId = streamManager.registerStream(appId, blocks.iterator.asJava)
logTrace(s"Registered streamId $streamId with ${blocks.size} buffers")
responseContext.onSuccess(new StreamHandle(streamId, blocks.size).toByteArray)

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.