Merge remote-tracking branch 'apache/master' into scala-2.11-prashant
Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/fd849b0b Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/fd849b0b Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/fd849b0b Branch: refs/heads/scala-2.11-prashant Commit: fd849b0b44aada8e45ac2ba3100b38c663f4edf6 Parents: 37d972c d4fa04e Author: Patrick Wendell <[email protected]> Authored: Fri Nov 7 11:27:00 2014 -0800 Committer: Patrick Wendell <[email protected]> Committed: Fri Nov 7 11:27:00 2014 -0800 ---------------------------------------------------------------------- .../org/apache/spark/ui/static/webui.css | 14 +++ .../scala/org/apache/spark/TaskEndReason.scala | 35 +++++- .../org/apache/spark/executor/Executor.scala | 2 +- .../spark/network/BlockTransferService.scala | 4 +- .../network/netty/NettyBlockRpcServer.scala | 31 ++--- .../netty/NettyBlockTransferService.scala | 15 ++- .../network/nio/NioBlockTransferService.scala | 1 + .../apache/spark/scheduler/DAGScheduler.scala | 4 +- .../spark/shuffle/FetchFailedException.scala | 17 ++- .../shuffle/hash/BlockStoreShuffleFetcher.scala | 5 +- .../org/apache/spark/storage/BlockManager.scala | 5 +- .../org/apache/spark/ui/jobs/StagePage.scala | 32 +++++- .../org/apache/spark/ui/jobs/StageTable.scala | 28 ++++- .../org/apache/spark/util/JsonProtocol.scala | 5 +- .../scala/org/apache/spark/util/Utils.scala | 24 ++-- .../netty/NettyBlockTransferSecuritySuite.scala | 4 +- .../ui/jobs/JobProgressListenerSuite.scala | 2 +- .../apache/spark/util/JsonProtocolSuite.scala | 10 +- .../network/protocol/ChunkFetchFailure.java | 12 +- .../apache/spark/network/protocol/Encoders.java | 93 +++++++++++++++ .../spark/network/protocol/RpcFailure.java | 12 +- .../spark/network/protocol/RpcRequest.java | 9 +- .../spark/network/protocol/RpcResponse.java | 9 +- .../apache/spark/network/util/JavaUtils.java | 27 ----- .../apache/spark/network/sasl/SaslMessage.java | 24 ++-- .../network/shuffle/ExecutorShuffleInfo.java | 64 ----------- .../shuffle/ExternalShuffleBlockHandler.java | 21 ++-- .../shuffle/ExternalShuffleBlockManager.java | 1 + .../network/shuffle/ExternalShuffleClient.java | 12 +- .../shuffle/ExternalShuffleMessages.java | 106 ----------------- .../network/shuffle/OneForOneBlockFetcher.java | 17 ++- .../network/shuffle/ShuffleStreamHandle.java | 60 ---------- .../shuffle/protocol/BlockTransferMessage.java | 76 +++++++++++++ .../shuffle/protocol/ExecutorShuffleInfo.java | 88 +++++++++++++++ .../network/shuffle/protocol/OpenBlocks.java | 87 ++++++++++++++ .../shuffle/protocol/RegisterExecutor.java | 91 +++++++++++++++ .../network/shuffle/protocol/StreamHandle.java | 80 +++++++++++++ .../network/shuffle/protocol/UploadBlock.java | 113 +++++++++++++++++++ .../shuffle/BlockTransferMessagesSuite.java | 44 ++++++++ .../ExternalShuffleBlockHandlerSuite.java | 29 ++--- .../ExternalShuffleIntegrationSuite.java | 1 + .../shuffle/ExternalShuffleSecuritySuite.java | 1 + .../shuffle/OneForOneBlockFetcherSuite.java | 18 +-- .../network/shuffle/ShuffleMessagesSuite.java | 51 --------- .../network/shuffle/TestShuffleDataContext.java | 2 + 45 files changed, 930 insertions(+), 456 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
