diff options
-rw-r--r-- | common/network-common/pom.xml (renamed from network/common/pom.xml) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/TransportContext.java (renamed from network/common/src/main/java/org/apache/spark/network/TransportContext.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/buffer/FileSegmentManagedBuffer.java (renamed from network/common/src/main/java/org/apache/spark/network/buffer/FileSegmentManagedBuffer.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/buffer/LazyFileRegion.java (renamed from network/common/src/main/java/org/apache/spark/network/buffer/LazyFileRegion.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/buffer/ManagedBuffer.java (renamed from network/common/src/main/java/org/apache/spark/network/buffer/ManagedBuffer.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/buffer/NettyManagedBuffer.java (renamed from network/common/src/main/java/org/apache/spark/network/buffer/NettyManagedBuffer.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/buffer/NioManagedBuffer.java (renamed from network/common/src/main/java/org/apache/spark/network/buffer/NioManagedBuffer.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/client/ChunkFetchFailureException.java (renamed from network/common/src/main/java/org/apache/spark/network/client/ChunkFetchFailureException.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/client/ChunkReceivedCallback.java (renamed from network/common/src/main/java/org/apache/spark/network/client/ChunkReceivedCallback.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/client/RpcResponseCallback.java (renamed from network/common/src/main/java/org/apache/spark/network/client/RpcResponseCallback.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/client/StreamCallback.java (renamed from network/common/src/main/java/org/apache/spark/network/client/StreamCallback.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/client/StreamInterceptor.java (renamed from network/common/src/main/java/org/apache/spark/network/client/StreamInterceptor.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/client/TransportClient.java (renamed from network/common/src/main/java/org/apache/spark/network/client/TransportClient.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/client/TransportClientBootstrap.java (renamed from network/common/src/main/java/org/apache/spark/network/client/TransportClientBootstrap.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/client/TransportClientFactory.java (renamed from network/common/src/main/java/org/apache/spark/network/client/TransportClientFactory.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/client/TransportResponseHandler.java (renamed from network/common/src/main/java/org/apache/spark/network/client/TransportResponseHandler.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/protocol/AbstractMessage.java (renamed from network/common/src/main/java/org/apache/spark/network/protocol/AbstractMessage.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/protocol/AbstractResponseMessage.java (renamed from network/common/src/main/java/org/apache/spark/network/protocol/AbstractResponseMessage.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/protocol/ChunkFetchFailure.java (renamed from network/common/src/main/java/org/apache/spark/network/protocol/ChunkFetchFailure.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/protocol/ChunkFetchRequest.java (renamed from network/common/src/main/java/org/apache/spark/network/protocol/ChunkFetchRequest.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/protocol/ChunkFetchSuccess.java (renamed from network/common/src/main/java/org/apache/spark/network/protocol/ChunkFetchSuccess.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/protocol/Encodable.java (renamed from network/common/src/main/java/org/apache/spark/network/protocol/Encodable.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/protocol/Encoders.java (renamed from network/common/src/main/java/org/apache/spark/network/protocol/Encoders.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/protocol/Message.java (renamed from network/common/src/main/java/org/apache/spark/network/protocol/Message.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/protocol/MessageDecoder.java (renamed from network/common/src/main/java/org/apache/spark/network/protocol/MessageDecoder.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/protocol/MessageEncoder.java (renamed from network/common/src/main/java/org/apache/spark/network/protocol/MessageEncoder.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/protocol/MessageWithHeader.java (renamed from network/common/src/main/java/org/apache/spark/network/protocol/MessageWithHeader.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/protocol/OneWayMessage.java (renamed from network/common/src/main/java/org/apache/spark/network/protocol/OneWayMessage.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/protocol/RequestMessage.java (renamed from network/common/src/main/java/org/apache/spark/network/protocol/RequestMessage.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/protocol/ResponseMessage.java (renamed from network/common/src/main/java/org/apache/spark/network/protocol/ResponseMessage.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/protocol/RpcFailure.java (renamed from network/common/src/main/java/org/apache/spark/network/protocol/RpcFailure.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/protocol/RpcRequest.java (renamed from network/common/src/main/java/org/apache/spark/network/protocol/RpcRequest.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/protocol/RpcResponse.java (renamed from network/common/src/main/java/org/apache/spark/network/protocol/RpcResponse.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/protocol/StreamChunkId.java (renamed from network/common/src/main/java/org/apache/spark/network/protocol/StreamChunkId.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/protocol/StreamFailure.java (renamed from network/common/src/main/java/org/apache/spark/network/protocol/StreamFailure.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/protocol/StreamRequest.java (renamed from network/common/src/main/java/org/apache/spark/network/protocol/StreamRequest.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/protocol/StreamResponse.java (renamed from network/common/src/main/java/org/apache/spark/network/protocol/StreamResponse.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/sasl/SaslClientBootstrap.java (renamed from network/common/src/main/java/org/apache/spark/network/sasl/SaslClientBootstrap.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/sasl/SaslEncryption.java (renamed from network/common/src/main/java/org/apache/spark/network/sasl/SaslEncryption.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/sasl/SaslEncryptionBackend.java (renamed from network/common/src/main/java/org/apache/spark/network/sasl/SaslEncryptionBackend.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/sasl/SaslMessage.java (renamed from network/common/src/main/java/org/apache/spark/network/sasl/SaslMessage.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/sasl/SaslRpcHandler.java (renamed from network/common/src/main/java/org/apache/spark/network/sasl/SaslRpcHandler.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/sasl/SaslServerBootstrap.java (renamed from network/common/src/main/java/org/apache/spark/network/sasl/SaslServerBootstrap.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/sasl/SecretKeyHolder.java (renamed from network/common/src/main/java/org/apache/spark/network/sasl/SecretKeyHolder.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/sasl/SparkSaslClient.java (renamed from network/common/src/main/java/org/apache/spark/network/sasl/SparkSaslClient.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/sasl/SparkSaslServer.java (renamed from network/common/src/main/java/org/apache/spark/network/sasl/SparkSaslServer.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/server/MessageHandler.java (renamed from network/common/src/main/java/org/apache/spark/network/server/MessageHandler.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/server/NoOpRpcHandler.java (renamed from network/common/src/main/java/org/apache/spark/network/server/NoOpRpcHandler.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/server/OneForOneStreamManager.java (renamed from network/common/src/main/java/org/apache/spark/network/server/OneForOneStreamManager.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/server/RpcHandler.java (renamed from network/common/src/main/java/org/apache/spark/network/server/RpcHandler.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/server/StreamManager.java (renamed from network/common/src/main/java/org/apache/spark/network/server/StreamManager.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/server/TransportChannelHandler.java (renamed from network/common/src/main/java/org/apache/spark/network/server/TransportChannelHandler.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/server/TransportRequestHandler.java (renamed from network/common/src/main/java/org/apache/spark/network/server/TransportRequestHandler.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/server/TransportServer.java (renamed from network/common/src/main/java/org/apache/spark/network/server/TransportServer.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/server/TransportServerBootstrap.java (renamed from network/common/src/main/java/org/apache/spark/network/server/TransportServerBootstrap.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/util/ByteArrayWritableChannel.java (renamed from network/common/src/main/java/org/apache/spark/network/util/ByteArrayWritableChannel.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/util/ByteUnit.java (renamed from network/common/src/main/java/org/apache/spark/network/util/ByteUnit.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/util/ConfigProvider.java (renamed from network/common/src/main/java/org/apache/spark/network/util/ConfigProvider.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/util/IOMode.java (renamed from network/common/src/main/java/org/apache/spark/network/util/IOMode.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/util/JavaUtils.java (renamed from network/common/src/main/java/org/apache/spark/network/util/JavaUtils.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/util/LimitedInputStream.java (renamed from network/common/src/main/java/org/apache/spark/network/util/LimitedInputStream.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/util/MapConfigProvider.java (renamed from network/common/src/main/java/org/apache/spark/network/util/MapConfigProvider.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/util/NettyUtils.java (renamed from network/common/src/main/java/org/apache/spark/network/util/NettyUtils.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/util/SystemPropertyConfigProvider.java (renamed from network/common/src/main/java/org/apache/spark/network/util/SystemPropertyConfigProvider.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/util/TransportConf.java (renamed from network/common/src/main/java/org/apache/spark/network/util/TransportConf.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/util/TransportFrameDecoder.java (renamed from network/common/src/main/java/org/apache/spark/network/util/TransportFrameDecoder.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/test/java/org/apache/spark/network/ChunkFetchIntegrationSuite.java (renamed from network/common/src/test/java/org/apache/spark/network/ChunkFetchIntegrationSuite.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/test/java/org/apache/spark/network/ProtocolSuite.java (renamed from network/common/src/test/java/org/apache/spark/network/ProtocolSuite.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/test/java/org/apache/spark/network/RequestTimeoutIntegrationSuite.java (renamed from network/common/src/test/java/org/apache/spark/network/RequestTimeoutIntegrationSuite.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/test/java/org/apache/spark/network/RpcIntegrationSuite.java (renamed from network/common/src/test/java/org/apache/spark/network/RpcIntegrationSuite.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/test/java/org/apache/spark/network/StreamSuite.java (renamed from network/common/src/test/java/org/apache/spark/network/StreamSuite.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/test/java/org/apache/spark/network/TestManagedBuffer.java (renamed from network/common/src/test/java/org/apache/spark/network/TestManagedBuffer.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/test/java/org/apache/spark/network/TestUtils.java (renamed from network/common/src/test/java/org/apache/spark/network/TestUtils.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/test/java/org/apache/spark/network/TransportClientFactorySuite.java (renamed from network/common/src/test/java/org/apache/spark/network/TransportClientFactorySuite.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/test/java/org/apache/spark/network/TransportResponseHandlerSuite.java (renamed from network/common/src/test/java/org/apache/spark/network/TransportResponseHandlerSuite.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/test/java/org/apache/spark/network/protocol/MessageWithHeaderSuite.java (renamed from network/common/src/test/java/org/apache/spark/network/protocol/MessageWithHeaderSuite.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/test/java/org/apache/spark/network/sasl/SparkSaslSuite.java (renamed from network/common/src/test/java/org/apache/spark/network/sasl/SparkSaslSuite.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/test/java/org/apache/spark/network/server/OneForOneStreamManagerSuite.java (renamed from network/common/src/test/java/org/apache/spark/network/server/OneForOneStreamManagerSuite.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/test/java/org/apache/spark/network/util/TransportFrameDecoderSuite.java (renamed from network/common/src/test/java/org/apache/spark/network/util/TransportFrameDecoderSuite.java) | 0 | ||||
-rw-r--r-- | common/network-common/src/test/resources/log4j.properties (renamed from network/common/src/test/resources/log4j.properties) | 0 | ||||
-rw-r--r-- | common/network-shuffle/pom.xml (renamed from network/shuffle/pom.xml) | 0 | ||||
-rw-r--r-- | common/network-shuffle/src/main/java/org/apache/spark/network/sasl/ShuffleSecretManager.java (renamed from network/shuffle/src/main/java/org/apache/spark/network/sasl/ShuffleSecretManager.java) | 0 | ||||
-rw-r--r-- | common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/BlockFetchingListener.java (renamed from network/shuffle/src/main/java/org/apache/spark/network/shuffle/BlockFetchingListener.java) | 0 | ||||
-rw-r--r-- | common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleBlockHandler.java (renamed from network/shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleBlockHandler.java) | 0 | ||||
-rw-r--r-- | common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleBlockResolver.java (renamed from network/shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleBlockResolver.java) | 0 | ||||
-rw-r--r-- | common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleClient.java (renamed from network/shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleClient.java) | 0 | ||||
-rw-r--r-- | common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/OneForOneBlockFetcher.java (renamed from network/shuffle/src/main/java/org/apache/spark/network/shuffle/OneForOneBlockFetcher.java) | 0 | ||||
-rw-r--r-- | common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/RetryingBlockFetcher.java (renamed from network/shuffle/src/main/java/org/apache/spark/network/shuffle/RetryingBlockFetcher.java) | 0 | ||||
-rw-r--r-- | common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/ShuffleClient.java (renamed from network/shuffle/src/main/java/org/apache/spark/network/shuffle/ShuffleClient.java) | 0 | ||||
-rw-r--r-- | common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/mesos/MesosExternalShuffleClient.java (renamed from network/shuffle/src/main/java/org/apache/spark/network/shuffle/mesos/MesosExternalShuffleClient.java) | 0 | ||||
-rw-r--r-- | common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/BlockTransferMessage.java (renamed from network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/BlockTransferMessage.java) | 0 | ||||
-rw-r--r-- | common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/ExecutorShuffleInfo.java (renamed from network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/ExecutorShuffleInfo.java) | 0 | ||||
-rw-r--r-- | common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/OpenBlocks.java (renamed from network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/OpenBlocks.java) | 0 | ||||
-rw-r--r-- | common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/RegisterExecutor.java (renamed from network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/RegisterExecutor.java) | 0 | ||||
-rw-r--r-- | common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/StreamHandle.java (renamed from network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/StreamHandle.java) | 0 | ||||
-rw-r--r-- | common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/UploadBlock.java (renamed from network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/UploadBlock.java) | 0 | ||||
-rw-r--r-- | common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/mesos/RegisterDriver.java (renamed from network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/mesos/RegisterDriver.java) | 0 | ||||
-rw-r--r-- | common/network-shuffle/src/test/java/org/apache/spark/network/sasl/SaslIntegrationSuite.java (renamed from network/shuffle/src/test/java/org/apache/spark/network/sasl/SaslIntegrationSuite.java) | 0 | ||||
-rw-r--r-- | common/network-shuffle/src/test/java/org/apache/spark/network/shuffle/BlockTransferMessagesSuite.java (renamed from network/shuffle/src/test/java/org/apache/spark/network/shuffle/BlockTransferMessagesSuite.java) | 0 | ||||
-rw-r--r-- | common/network-shuffle/src/test/java/org/apache/spark/network/shuffle/ExternalShuffleBlockHandlerSuite.java (renamed from network/shuffle/src/test/java/org/apache/spark/network/shuffle/ExternalShuffleBlockHandlerSuite.java) | 0 | ||||
-rw-r--r-- | common/network-shuffle/src/test/java/org/apache/spark/network/shuffle/ExternalShuffleBlockResolverSuite.java (renamed from network/shuffle/src/test/java/org/apache/spark/network/shuffle/ExternalShuffleBlockResolverSuite.java) | 0 | ||||
-rw-r--r-- | common/network-shuffle/src/test/java/org/apache/spark/network/shuffle/ExternalShuffleCleanupSuite.java (renamed from network/shuffle/src/test/java/org/apache/spark/network/shuffle/ExternalShuffleCleanupSuite.java) | 0 | ||||
-rw-r--r-- | common/network-shuffle/src/test/java/org/apache/spark/network/shuffle/ExternalShuffleIntegrationSuite.java (renamed from network/shuffle/src/test/java/org/apache/spark/network/shuffle/ExternalShuffleIntegrationSuite.java) | 0 | ||||
-rw-r--r-- | common/network-shuffle/src/test/java/org/apache/spark/network/shuffle/ExternalShuffleSecuritySuite.java (renamed from network/shuffle/src/test/java/org/apache/spark/network/shuffle/ExternalShuffleSecuritySuite.java) | 0 | ||||
-rw-r--r-- | common/network-shuffle/src/test/java/org/apache/spark/network/shuffle/OneForOneBlockFetcherSuite.java (renamed from network/shuffle/src/test/java/org/apache/spark/network/shuffle/OneForOneBlockFetcherSuite.java) | 0 | ||||
-rw-r--r-- | common/network-shuffle/src/test/java/org/apache/spark/network/shuffle/RetryingBlockFetcherSuite.java (renamed from network/shuffle/src/test/java/org/apache/spark/network/shuffle/RetryingBlockFetcherSuite.java) | 0 | ||||
-rw-r--r-- | common/network-shuffle/src/test/java/org/apache/spark/network/shuffle/TestShuffleDataContext.java (renamed from network/shuffle/src/test/java/org/apache/spark/network/shuffle/TestShuffleDataContext.java) | 0 | ||||
-rw-r--r-- | common/network-yarn/pom.xml (renamed from network/yarn/pom.xml) | 0 | ||||
-rw-r--r-- | common/network-yarn/src/main/java/org/apache/spark/network/yarn/YarnShuffleService.java (renamed from network/yarn/src/main/java/org/apache/spark/network/yarn/YarnShuffleService.java) | 0 | ||||
-rw-r--r-- | common/network-yarn/src/main/java/org/apache/spark/network/yarn/util/HadoopConfigProvider.java (renamed from network/yarn/src/main/java/org/apache/spark/network/yarn/util/HadoopConfigProvider.java) | 0 | ||||
-rw-r--r-- | dev/sparktestsupport/modules.py | 4 | ||||
-rw-r--r-- | docs/job-scheduling.md | 2 | ||||
-rw-r--r-- | launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java | 3 | ||||
-rwxr-xr-x | make-distribution.sh | 2 | ||||
-rw-r--r-- | pom.xml | 6 |
115 files changed, 9 insertions, 8 deletions
diff --git a/network/common/pom.xml b/common/network-common/pom.xml index bd507c2cb6..bd507c2cb6 100644 --- a/network/common/pom.xml +++ b/common/network-common/pom.xml diff --git a/network/common/src/main/java/org/apache/spark/network/TransportContext.java b/common/network-common/src/main/java/org/apache/spark/network/TransportContext.java index 238710d172..238710d172 100644 --- a/network/common/src/main/java/org/apache/spark/network/TransportContext.java +++ b/common/network-common/src/main/java/org/apache/spark/network/TransportContext.java diff --git a/network/common/src/main/java/org/apache/spark/network/buffer/FileSegmentManagedBuffer.java b/common/network-common/src/main/java/org/apache/spark/network/buffer/FileSegmentManagedBuffer.java index 844eff4f4c..844eff4f4c 100644 --- a/network/common/src/main/java/org/apache/spark/network/buffer/FileSegmentManagedBuffer.java +++ b/common/network-common/src/main/java/org/apache/spark/network/buffer/FileSegmentManagedBuffer.java diff --git a/network/common/src/main/java/org/apache/spark/network/buffer/LazyFileRegion.java b/common/network-common/src/main/java/org/apache/spark/network/buffer/LazyFileRegion.java index 162cf6da0d..162cf6da0d 100644 --- a/network/common/src/main/java/org/apache/spark/network/buffer/LazyFileRegion.java +++ b/common/network-common/src/main/java/org/apache/spark/network/buffer/LazyFileRegion.java diff --git a/network/common/src/main/java/org/apache/spark/network/buffer/ManagedBuffer.java b/common/network-common/src/main/java/org/apache/spark/network/buffer/ManagedBuffer.java index 1861f8d7fd..1861f8d7fd 100644 --- a/network/common/src/main/java/org/apache/spark/network/buffer/ManagedBuffer.java +++ b/common/network-common/src/main/java/org/apache/spark/network/buffer/ManagedBuffer.java diff --git a/network/common/src/main/java/org/apache/spark/network/buffer/NettyManagedBuffer.java b/common/network-common/src/main/java/org/apache/spark/network/buffer/NettyManagedBuffer.java index 4c8802af7a..4c8802af7a 100644 --- a/network/common/src/main/java/org/apache/spark/network/buffer/NettyManagedBuffer.java +++ b/common/network-common/src/main/java/org/apache/spark/network/buffer/NettyManagedBuffer.java diff --git a/network/common/src/main/java/org/apache/spark/network/buffer/NioManagedBuffer.java b/common/network-common/src/main/java/org/apache/spark/network/buffer/NioManagedBuffer.java index 631d767715..631d767715 100644 --- a/network/common/src/main/java/org/apache/spark/network/buffer/NioManagedBuffer.java +++ b/common/network-common/src/main/java/org/apache/spark/network/buffer/NioManagedBuffer.java diff --git a/network/common/src/main/java/org/apache/spark/network/client/ChunkFetchFailureException.java b/common/network-common/src/main/java/org/apache/spark/network/client/ChunkFetchFailureException.java index 1fbdcd6780..1fbdcd6780 100644 --- a/network/common/src/main/java/org/apache/spark/network/client/ChunkFetchFailureException.java +++ b/common/network-common/src/main/java/org/apache/spark/network/client/ChunkFetchFailureException.java diff --git a/network/common/src/main/java/org/apache/spark/network/client/ChunkReceivedCallback.java b/common/network-common/src/main/java/org/apache/spark/network/client/ChunkReceivedCallback.java index 519e6cb470..519e6cb470 100644 --- a/network/common/src/main/java/org/apache/spark/network/client/ChunkReceivedCallback.java +++ b/common/network-common/src/main/java/org/apache/spark/network/client/ChunkReceivedCallback.java diff --git a/network/common/src/main/java/org/apache/spark/network/client/RpcResponseCallback.java b/common/network-common/src/main/java/org/apache/spark/network/client/RpcResponseCallback.java index 47e93f9846..47e93f9846 100644 --- a/network/common/src/main/java/org/apache/spark/network/client/RpcResponseCallback.java +++ b/common/network-common/src/main/java/org/apache/spark/network/client/RpcResponseCallback.java diff --git a/network/common/src/main/java/org/apache/spark/network/client/StreamCallback.java b/common/network-common/src/main/java/org/apache/spark/network/client/StreamCallback.java index 29e6a30dc1..29e6a30dc1 100644 --- a/network/common/src/main/java/org/apache/spark/network/client/StreamCallback.java +++ b/common/network-common/src/main/java/org/apache/spark/network/client/StreamCallback.java diff --git a/network/common/src/main/java/org/apache/spark/network/client/StreamInterceptor.java b/common/network-common/src/main/java/org/apache/spark/network/client/StreamInterceptor.java index 88ba3ccebd..88ba3ccebd 100644 --- a/network/common/src/main/java/org/apache/spark/network/client/StreamInterceptor.java +++ b/common/network-common/src/main/java/org/apache/spark/network/client/StreamInterceptor.java diff --git a/network/common/src/main/java/org/apache/spark/network/client/TransportClient.java b/common/network-common/src/main/java/org/apache/spark/network/client/TransportClient.java index e15f096d36..e15f096d36 100644 --- a/network/common/src/main/java/org/apache/spark/network/client/TransportClient.java +++ b/common/network-common/src/main/java/org/apache/spark/network/client/TransportClient.java diff --git a/network/common/src/main/java/org/apache/spark/network/client/TransportClientBootstrap.java b/common/network-common/src/main/java/org/apache/spark/network/client/TransportClientBootstrap.java index eaae2ee043..eaae2ee043 100644 --- a/network/common/src/main/java/org/apache/spark/network/client/TransportClientBootstrap.java +++ b/common/network-common/src/main/java/org/apache/spark/network/client/TransportClientBootstrap.java diff --git a/network/common/src/main/java/org/apache/spark/network/client/TransportClientFactory.java b/common/network-common/src/main/java/org/apache/spark/network/client/TransportClientFactory.java index 61bafc8380..61bafc8380 100644 --- a/network/common/src/main/java/org/apache/spark/network/client/TransportClientFactory.java +++ b/common/network-common/src/main/java/org/apache/spark/network/client/TransportClientFactory.java diff --git a/network/common/src/main/java/org/apache/spark/network/client/TransportResponseHandler.java b/common/network-common/src/main/java/org/apache/spark/network/client/TransportResponseHandler.java index f0e2004d2d..f0e2004d2d 100644 --- a/network/common/src/main/java/org/apache/spark/network/client/TransportResponseHandler.java +++ b/common/network-common/src/main/java/org/apache/spark/network/client/TransportResponseHandler.java diff --git a/network/common/src/main/java/org/apache/spark/network/protocol/AbstractMessage.java b/common/network-common/src/main/java/org/apache/spark/network/protocol/AbstractMessage.java index 2924218c2f..2924218c2f 100644 --- a/network/common/src/main/java/org/apache/spark/network/protocol/AbstractMessage.java +++ b/common/network-common/src/main/java/org/apache/spark/network/protocol/AbstractMessage.java diff --git a/network/common/src/main/java/org/apache/spark/network/protocol/AbstractResponseMessage.java b/common/network-common/src/main/java/org/apache/spark/network/protocol/AbstractResponseMessage.java index c362c92fc4..c362c92fc4 100644 --- a/network/common/src/main/java/org/apache/spark/network/protocol/AbstractResponseMessage.java +++ b/common/network-common/src/main/java/org/apache/spark/network/protocol/AbstractResponseMessage.java diff --git a/network/common/src/main/java/org/apache/spark/network/protocol/ChunkFetchFailure.java b/common/network-common/src/main/java/org/apache/spark/network/protocol/ChunkFetchFailure.java index 7b28a9a969..7b28a9a969 100644 --- a/network/common/src/main/java/org/apache/spark/network/protocol/ChunkFetchFailure.java +++ b/common/network-common/src/main/java/org/apache/spark/network/protocol/ChunkFetchFailure.java diff --git a/network/common/src/main/java/org/apache/spark/network/protocol/ChunkFetchRequest.java b/common/network-common/src/main/java/org/apache/spark/network/protocol/ChunkFetchRequest.java index 26d063feb5..26d063feb5 100644 --- a/network/common/src/main/java/org/apache/spark/network/protocol/ChunkFetchRequest.java +++ b/common/network-common/src/main/java/org/apache/spark/network/protocol/ChunkFetchRequest.java diff --git a/network/common/src/main/java/org/apache/spark/network/protocol/ChunkFetchSuccess.java b/common/network-common/src/main/java/org/apache/spark/network/protocol/ChunkFetchSuccess.java index 94c2ac9b20..94c2ac9b20 100644 --- a/network/common/src/main/java/org/apache/spark/network/protocol/ChunkFetchSuccess.java +++ b/common/network-common/src/main/java/org/apache/spark/network/protocol/ChunkFetchSuccess.java diff --git a/network/common/src/main/java/org/apache/spark/network/protocol/Encodable.java b/common/network-common/src/main/java/org/apache/spark/network/protocol/Encodable.java index b4e299471b..b4e299471b 100644 --- a/network/common/src/main/java/org/apache/spark/network/protocol/Encodable.java +++ b/common/network-common/src/main/java/org/apache/spark/network/protocol/Encodable.java diff --git a/network/common/src/main/java/org/apache/spark/network/protocol/Encoders.java b/common/network-common/src/main/java/org/apache/spark/network/protocol/Encoders.java index 9162d0b977..9162d0b977 100644 --- a/network/common/src/main/java/org/apache/spark/network/protocol/Encoders.java +++ b/common/network-common/src/main/java/org/apache/spark/network/protocol/Encoders.java diff --git a/network/common/src/main/java/org/apache/spark/network/protocol/Message.java b/common/network-common/src/main/java/org/apache/spark/network/protocol/Message.java index 66f5b8b3a5..66f5b8b3a5 100644 --- a/network/common/src/main/java/org/apache/spark/network/protocol/Message.java +++ b/common/network-common/src/main/java/org/apache/spark/network/protocol/Message.java diff --git a/network/common/src/main/java/org/apache/spark/network/protocol/MessageDecoder.java b/common/network-common/src/main/java/org/apache/spark/network/protocol/MessageDecoder.java index 074780f2b9..074780f2b9 100644 --- a/network/common/src/main/java/org/apache/spark/network/protocol/MessageDecoder.java +++ b/common/network-common/src/main/java/org/apache/spark/network/protocol/MessageDecoder.java diff --git a/network/common/src/main/java/org/apache/spark/network/protocol/MessageEncoder.java b/common/network-common/src/main/java/org/apache/spark/network/protocol/MessageEncoder.java index 664df57fec..664df57fec 100644 --- a/network/common/src/main/java/org/apache/spark/network/protocol/MessageEncoder.java +++ b/common/network-common/src/main/java/org/apache/spark/network/protocol/MessageEncoder.java diff --git a/network/common/src/main/java/org/apache/spark/network/protocol/MessageWithHeader.java b/common/network-common/src/main/java/org/apache/spark/network/protocol/MessageWithHeader.java index 66227f96a1..66227f96a1 100644 --- a/network/common/src/main/java/org/apache/spark/network/protocol/MessageWithHeader.java +++ b/common/network-common/src/main/java/org/apache/spark/network/protocol/MessageWithHeader.java diff --git a/network/common/src/main/java/org/apache/spark/network/protocol/OneWayMessage.java b/common/network-common/src/main/java/org/apache/spark/network/protocol/OneWayMessage.java index efe0470f35..efe0470f35 100644 --- a/network/common/src/main/java/org/apache/spark/network/protocol/OneWayMessage.java +++ b/common/network-common/src/main/java/org/apache/spark/network/protocol/OneWayMessage.java diff --git a/network/common/src/main/java/org/apache/spark/network/protocol/RequestMessage.java b/common/network-common/src/main/java/org/apache/spark/network/protocol/RequestMessage.java index 31b15bb17a..31b15bb17a 100644 --- a/network/common/src/main/java/org/apache/spark/network/protocol/RequestMessage.java +++ b/common/network-common/src/main/java/org/apache/spark/network/protocol/RequestMessage.java diff --git a/network/common/src/main/java/org/apache/spark/network/protocol/ResponseMessage.java b/common/network-common/src/main/java/org/apache/spark/network/protocol/ResponseMessage.java index 6edffd11cf..6edffd11cf 100644 --- a/network/common/src/main/java/org/apache/spark/network/protocol/ResponseMessage.java +++ b/common/network-common/src/main/java/org/apache/spark/network/protocol/ResponseMessage.java diff --git a/network/common/src/main/java/org/apache/spark/network/protocol/RpcFailure.java b/common/network-common/src/main/java/org/apache/spark/network/protocol/RpcFailure.java index a76624ef5d..a76624ef5d 100644 --- a/network/common/src/main/java/org/apache/spark/network/protocol/RpcFailure.java +++ b/common/network-common/src/main/java/org/apache/spark/network/protocol/RpcFailure.java diff --git a/network/common/src/main/java/org/apache/spark/network/protocol/RpcRequest.java b/common/network-common/src/main/java/org/apache/spark/network/protocol/RpcRequest.java index 96213794a8..96213794a8 100644 --- a/network/common/src/main/java/org/apache/spark/network/protocol/RpcRequest.java +++ b/common/network-common/src/main/java/org/apache/spark/network/protocol/RpcRequest.java diff --git a/network/common/src/main/java/org/apache/spark/network/protocol/RpcResponse.java b/common/network-common/src/main/java/org/apache/spark/network/protocol/RpcResponse.java index bae866e14a..bae866e14a 100644 --- a/network/common/src/main/java/org/apache/spark/network/protocol/RpcResponse.java +++ b/common/network-common/src/main/java/org/apache/spark/network/protocol/RpcResponse.java diff --git a/network/common/src/main/java/org/apache/spark/network/protocol/StreamChunkId.java b/common/network-common/src/main/java/org/apache/spark/network/protocol/StreamChunkId.java index d46a263884..d46a263884 100644 --- a/network/common/src/main/java/org/apache/spark/network/protocol/StreamChunkId.java +++ b/common/network-common/src/main/java/org/apache/spark/network/protocol/StreamChunkId.java diff --git a/network/common/src/main/java/org/apache/spark/network/protocol/StreamFailure.java b/common/network-common/src/main/java/org/apache/spark/network/protocol/StreamFailure.java index 26747ee55b..26747ee55b 100644 --- a/network/common/src/main/java/org/apache/spark/network/protocol/StreamFailure.java +++ b/common/network-common/src/main/java/org/apache/spark/network/protocol/StreamFailure.java diff --git a/network/common/src/main/java/org/apache/spark/network/protocol/StreamRequest.java b/common/network-common/src/main/java/org/apache/spark/network/protocol/StreamRequest.java index 35af5a84ba..35af5a84ba 100644 --- a/network/common/src/main/java/org/apache/spark/network/protocol/StreamRequest.java +++ b/common/network-common/src/main/java/org/apache/spark/network/protocol/StreamRequest.java diff --git a/network/common/src/main/java/org/apache/spark/network/protocol/StreamResponse.java b/common/network-common/src/main/java/org/apache/spark/network/protocol/StreamResponse.java index 51b899930f..51b899930f 100644 --- a/network/common/src/main/java/org/apache/spark/network/protocol/StreamResponse.java +++ b/common/network-common/src/main/java/org/apache/spark/network/protocol/StreamResponse.java diff --git a/network/common/src/main/java/org/apache/spark/network/sasl/SaslClientBootstrap.java b/common/network-common/src/main/java/org/apache/spark/network/sasl/SaslClientBootstrap.java index 68381037d6..68381037d6 100644 --- a/network/common/src/main/java/org/apache/spark/network/sasl/SaslClientBootstrap.java +++ b/common/network-common/src/main/java/org/apache/spark/network/sasl/SaslClientBootstrap.java diff --git a/network/common/src/main/java/org/apache/spark/network/sasl/SaslEncryption.java b/common/network-common/src/main/java/org/apache/spark/network/sasl/SaslEncryption.java index 127335e4d3..127335e4d3 100644 --- a/network/common/src/main/java/org/apache/spark/network/sasl/SaslEncryption.java +++ b/common/network-common/src/main/java/org/apache/spark/network/sasl/SaslEncryption.java diff --git a/network/common/src/main/java/org/apache/spark/network/sasl/SaslEncryptionBackend.java b/common/network-common/src/main/java/org/apache/spark/network/sasl/SaslEncryptionBackend.java index 89b78bc7e1..89b78bc7e1 100644 --- a/network/common/src/main/java/org/apache/spark/network/sasl/SaslEncryptionBackend.java +++ b/common/network-common/src/main/java/org/apache/spark/network/sasl/SaslEncryptionBackend.java diff --git a/network/common/src/main/java/org/apache/spark/network/sasl/SaslMessage.java b/common/network-common/src/main/java/org/apache/spark/network/sasl/SaslMessage.java index e52b526f09..e52b526f09 100644 --- a/network/common/src/main/java/org/apache/spark/network/sasl/SaslMessage.java +++ b/common/network-common/src/main/java/org/apache/spark/network/sasl/SaslMessage.java diff --git a/network/common/src/main/java/org/apache/spark/network/sasl/SaslRpcHandler.java b/common/network-common/src/main/java/org/apache/spark/network/sasl/SaslRpcHandler.java index c41f5b6873..c41f5b6873 100644 --- a/network/common/src/main/java/org/apache/spark/network/sasl/SaslRpcHandler.java +++ b/common/network-common/src/main/java/org/apache/spark/network/sasl/SaslRpcHandler.java diff --git a/network/common/src/main/java/org/apache/spark/network/sasl/SaslServerBootstrap.java b/common/network-common/src/main/java/org/apache/spark/network/sasl/SaslServerBootstrap.java index f2f983856f..f2f983856f 100644 --- a/network/common/src/main/java/org/apache/spark/network/sasl/SaslServerBootstrap.java +++ b/common/network-common/src/main/java/org/apache/spark/network/sasl/SaslServerBootstrap.java diff --git a/network/common/src/main/java/org/apache/spark/network/sasl/SecretKeyHolder.java b/common/network-common/src/main/java/org/apache/spark/network/sasl/SecretKeyHolder.java index 81d5766794..81d5766794 100644 --- a/network/common/src/main/java/org/apache/spark/network/sasl/SecretKeyHolder.java +++ b/common/network-common/src/main/java/org/apache/spark/network/sasl/SecretKeyHolder.java diff --git a/network/common/src/main/java/org/apache/spark/network/sasl/SparkSaslClient.java b/common/network-common/src/main/java/org/apache/spark/network/sasl/SparkSaslClient.java index 94685e91b8..94685e91b8 100644 --- a/network/common/src/main/java/org/apache/spark/network/sasl/SparkSaslClient.java +++ b/common/network-common/src/main/java/org/apache/spark/network/sasl/SparkSaslClient.java diff --git a/network/common/src/main/java/org/apache/spark/network/sasl/SparkSaslServer.java b/common/network-common/src/main/java/org/apache/spark/network/sasl/SparkSaslServer.java index 431cb67a2a..431cb67a2a 100644 --- a/network/common/src/main/java/org/apache/spark/network/sasl/SparkSaslServer.java +++ b/common/network-common/src/main/java/org/apache/spark/network/sasl/SparkSaslServer.java diff --git a/network/common/src/main/java/org/apache/spark/network/server/MessageHandler.java b/common/network-common/src/main/java/org/apache/spark/network/server/MessageHandler.java index 4a1f28e9ff..4a1f28e9ff 100644 --- a/network/common/src/main/java/org/apache/spark/network/server/MessageHandler.java +++ b/common/network-common/src/main/java/org/apache/spark/network/server/MessageHandler.java diff --git a/network/common/src/main/java/org/apache/spark/network/server/NoOpRpcHandler.java b/common/network-common/src/main/java/org/apache/spark/network/server/NoOpRpcHandler.java index 6ed61da5c7..6ed61da5c7 100644 --- a/network/common/src/main/java/org/apache/spark/network/server/NoOpRpcHandler.java +++ b/common/network-common/src/main/java/org/apache/spark/network/server/NoOpRpcHandler.java diff --git a/network/common/src/main/java/org/apache/spark/network/server/OneForOneStreamManager.java b/common/network-common/src/main/java/org/apache/spark/network/server/OneForOneStreamManager.java index ea9e735e0a..ea9e735e0a 100644 --- a/network/common/src/main/java/org/apache/spark/network/server/OneForOneStreamManager.java +++ b/common/network-common/src/main/java/org/apache/spark/network/server/OneForOneStreamManager.java diff --git a/network/common/src/main/java/org/apache/spark/network/server/RpcHandler.java b/common/network-common/src/main/java/org/apache/spark/network/server/RpcHandler.java index a99c3015b0..a99c3015b0 100644 --- a/network/common/src/main/java/org/apache/spark/network/server/RpcHandler.java +++ b/common/network-common/src/main/java/org/apache/spark/network/server/RpcHandler.java diff --git a/network/common/src/main/java/org/apache/spark/network/server/StreamManager.java b/common/network-common/src/main/java/org/apache/spark/network/server/StreamManager.java index 07f161a29c..07f161a29c 100644 --- a/network/common/src/main/java/org/apache/spark/network/server/StreamManager.java +++ b/common/network-common/src/main/java/org/apache/spark/network/server/StreamManager.java diff --git a/network/common/src/main/java/org/apache/spark/network/server/TransportChannelHandler.java b/common/network-common/src/main/java/org/apache/spark/network/server/TransportChannelHandler.java index 18a9b7887e..18a9b7887e 100644 --- a/network/common/src/main/java/org/apache/spark/network/server/TransportChannelHandler.java +++ b/common/network-common/src/main/java/org/apache/spark/network/server/TransportChannelHandler.java diff --git a/network/common/src/main/java/org/apache/spark/network/server/TransportRequestHandler.java b/common/network-common/src/main/java/org/apache/spark/network/server/TransportRequestHandler.java index 296ced3db0..296ced3db0 100644 --- a/network/common/src/main/java/org/apache/spark/network/server/TransportRequestHandler.java +++ b/common/network-common/src/main/java/org/apache/spark/network/server/TransportRequestHandler.java diff --git a/network/common/src/main/java/org/apache/spark/network/server/TransportServer.java b/common/network-common/src/main/java/org/apache/spark/network/server/TransportServer.java index baae235e02..baae235e02 100644 --- a/network/common/src/main/java/org/apache/spark/network/server/TransportServer.java +++ b/common/network-common/src/main/java/org/apache/spark/network/server/TransportServer.java diff --git a/network/common/src/main/java/org/apache/spark/network/server/TransportServerBootstrap.java b/common/network-common/src/main/java/org/apache/spark/network/server/TransportServerBootstrap.java index 05803ab1bb..05803ab1bb 100644 --- a/network/common/src/main/java/org/apache/spark/network/server/TransportServerBootstrap.java +++ b/common/network-common/src/main/java/org/apache/spark/network/server/TransportServerBootstrap.java diff --git a/network/common/src/main/java/org/apache/spark/network/util/ByteArrayWritableChannel.java b/common/network-common/src/main/java/org/apache/spark/network/util/ByteArrayWritableChannel.java index b141572004..b141572004 100644 --- a/network/common/src/main/java/org/apache/spark/network/util/ByteArrayWritableChannel.java +++ b/common/network-common/src/main/java/org/apache/spark/network/util/ByteArrayWritableChannel.java diff --git a/network/common/src/main/java/org/apache/spark/network/util/ByteUnit.java b/common/network-common/src/main/java/org/apache/spark/network/util/ByteUnit.java index a2f018373f..a2f018373f 100644 --- a/network/common/src/main/java/org/apache/spark/network/util/ByteUnit.java +++ b/common/network-common/src/main/java/org/apache/spark/network/util/ByteUnit.java diff --git a/network/common/src/main/java/org/apache/spark/network/util/ConfigProvider.java b/common/network-common/src/main/java/org/apache/spark/network/util/ConfigProvider.java index d944d9da1c..d944d9da1c 100644 --- a/network/common/src/main/java/org/apache/spark/network/util/ConfigProvider.java +++ b/common/network-common/src/main/java/org/apache/spark/network/util/ConfigProvider.java diff --git a/network/common/src/main/java/org/apache/spark/network/util/IOMode.java b/common/network-common/src/main/java/org/apache/spark/network/util/IOMode.java index 6b208d95bb..6b208d95bb 100644 --- a/network/common/src/main/java/org/apache/spark/network/util/IOMode.java +++ b/common/network-common/src/main/java/org/apache/spark/network/util/IOMode.java diff --git a/network/common/src/main/java/org/apache/spark/network/util/JavaUtils.java b/common/network-common/src/main/java/org/apache/spark/network/util/JavaUtils.java index b3d8e0cd7c..b3d8e0cd7c 100644 --- a/network/common/src/main/java/org/apache/spark/network/util/JavaUtils.java +++ b/common/network-common/src/main/java/org/apache/spark/network/util/JavaUtils.java diff --git a/network/common/src/main/java/org/apache/spark/network/util/LimitedInputStream.java b/common/network-common/src/main/java/org/apache/spark/network/util/LimitedInputStream.java index 922c37a10e..922c37a10e 100644 --- a/network/common/src/main/java/org/apache/spark/network/util/LimitedInputStream.java +++ b/common/network-common/src/main/java/org/apache/spark/network/util/LimitedInputStream.java diff --git a/network/common/src/main/java/org/apache/spark/network/util/MapConfigProvider.java b/common/network-common/src/main/java/org/apache/spark/network/util/MapConfigProvider.java index 668d2356b9..668d2356b9 100644 --- a/network/common/src/main/java/org/apache/spark/network/util/MapConfigProvider.java +++ b/common/network-common/src/main/java/org/apache/spark/network/util/MapConfigProvider.java diff --git a/network/common/src/main/java/org/apache/spark/network/util/NettyUtils.java b/common/network-common/src/main/java/org/apache/spark/network/util/NettyUtils.java index caa7260bc8..caa7260bc8 100644 --- a/network/common/src/main/java/org/apache/spark/network/util/NettyUtils.java +++ b/common/network-common/src/main/java/org/apache/spark/network/util/NettyUtils.java diff --git a/network/common/src/main/java/org/apache/spark/network/util/SystemPropertyConfigProvider.java b/common/network-common/src/main/java/org/apache/spark/network/util/SystemPropertyConfigProvider.java index 5f20b70678..5f20b70678 100644 --- a/network/common/src/main/java/org/apache/spark/network/util/SystemPropertyConfigProvider.java +++ b/common/network-common/src/main/java/org/apache/spark/network/util/SystemPropertyConfigProvider.java diff --git a/network/common/src/main/java/org/apache/spark/network/util/TransportConf.java b/common/network-common/src/main/java/org/apache/spark/network/util/TransportConf.java index 9f030da2b3..9f030da2b3 100644 --- a/network/common/src/main/java/org/apache/spark/network/util/TransportConf.java +++ b/common/network-common/src/main/java/org/apache/spark/network/util/TransportConf.java diff --git a/network/common/src/main/java/org/apache/spark/network/util/TransportFrameDecoder.java b/common/network-common/src/main/java/org/apache/spark/network/util/TransportFrameDecoder.java index a466c72915..a466c72915 100644 --- a/network/common/src/main/java/org/apache/spark/network/util/TransportFrameDecoder.java +++ b/common/network-common/src/main/java/org/apache/spark/network/util/TransportFrameDecoder.java diff --git a/network/common/src/test/java/org/apache/spark/network/ChunkFetchIntegrationSuite.java b/common/network-common/src/test/java/org/apache/spark/network/ChunkFetchIntegrationSuite.java index 70c849d60e..70c849d60e 100644 --- a/network/common/src/test/java/org/apache/spark/network/ChunkFetchIntegrationSuite.java +++ b/common/network-common/src/test/java/org/apache/spark/network/ChunkFetchIntegrationSuite.java diff --git a/network/common/src/test/java/org/apache/spark/network/ProtocolSuite.java b/common/network-common/src/test/java/org/apache/spark/network/ProtocolSuite.java index 6c8dd742f4..6c8dd742f4 100644 --- a/network/common/src/test/java/org/apache/spark/network/ProtocolSuite.java +++ b/common/network-common/src/test/java/org/apache/spark/network/ProtocolSuite.java diff --git a/network/common/src/test/java/org/apache/spark/network/RequestTimeoutIntegrationSuite.java b/common/network-common/src/test/java/org/apache/spark/network/RequestTimeoutIntegrationSuite.java index f9b5bf96d6..f9b5bf96d6 100644 --- a/network/common/src/test/java/org/apache/spark/network/RequestTimeoutIntegrationSuite.java +++ b/common/network-common/src/test/java/org/apache/spark/network/RequestTimeoutIntegrationSuite.java diff --git a/network/common/src/test/java/org/apache/spark/network/RpcIntegrationSuite.java b/common/network-common/src/test/java/org/apache/spark/network/RpcIntegrationSuite.java index 9e9be98c14..9e9be98c14 100644 --- a/network/common/src/test/java/org/apache/spark/network/RpcIntegrationSuite.java +++ b/common/network-common/src/test/java/org/apache/spark/network/RpcIntegrationSuite.java diff --git a/network/common/src/test/java/org/apache/spark/network/StreamSuite.java b/common/network-common/src/test/java/org/apache/spark/network/StreamSuite.java index 9c49556927..9c49556927 100644 --- a/network/common/src/test/java/org/apache/spark/network/StreamSuite.java +++ b/common/network-common/src/test/java/org/apache/spark/network/StreamSuite.java diff --git a/network/common/src/test/java/org/apache/spark/network/TestManagedBuffer.java b/common/network-common/src/test/java/org/apache/spark/network/TestManagedBuffer.java index 83c90f9eff..83c90f9eff 100644 --- a/network/common/src/test/java/org/apache/spark/network/TestManagedBuffer.java +++ b/common/network-common/src/test/java/org/apache/spark/network/TestManagedBuffer.java diff --git a/network/common/src/test/java/org/apache/spark/network/TestUtils.java b/common/network-common/src/test/java/org/apache/spark/network/TestUtils.java index 56a2b805f1..56a2b805f1 100644 --- a/network/common/src/test/java/org/apache/spark/network/TestUtils.java +++ b/common/network-common/src/test/java/org/apache/spark/network/TestUtils.java diff --git a/network/common/src/test/java/org/apache/spark/network/TransportClientFactorySuite.java b/common/network-common/src/test/java/org/apache/spark/network/TransportClientFactorySuite.java index dac7d4a5b0..dac7d4a5b0 100644 --- a/network/common/src/test/java/org/apache/spark/network/TransportClientFactorySuite.java +++ b/common/network-common/src/test/java/org/apache/spark/network/TransportClientFactorySuite.java diff --git a/network/common/src/test/java/org/apache/spark/network/TransportResponseHandlerSuite.java b/common/network-common/src/test/java/org/apache/spark/network/TransportResponseHandlerSuite.java index 128f7cba74..128f7cba74 100644 --- a/network/common/src/test/java/org/apache/spark/network/TransportResponseHandlerSuite.java +++ b/common/network-common/src/test/java/org/apache/spark/network/TransportResponseHandlerSuite.java diff --git a/network/common/src/test/java/org/apache/spark/network/protocol/MessageWithHeaderSuite.java b/common/network-common/src/test/java/org/apache/spark/network/protocol/MessageWithHeaderSuite.java index fbbe4b7014..fbbe4b7014 100644 --- a/network/common/src/test/java/org/apache/spark/network/protocol/MessageWithHeaderSuite.java +++ b/common/network-common/src/test/java/org/apache/spark/network/protocol/MessageWithHeaderSuite.java diff --git a/network/common/src/test/java/org/apache/spark/network/sasl/SparkSaslSuite.java b/common/network-common/src/test/java/org/apache/spark/network/sasl/SparkSaslSuite.java index 045773317a..045773317a 100644 --- a/network/common/src/test/java/org/apache/spark/network/sasl/SparkSaslSuite.java +++ b/common/network-common/src/test/java/org/apache/spark/network/sasl/SparkSaslSuite.java diff --git a/network/common/src/test/java/org/apache/spark/network/server/OneForOneStreamManagerSuite.java b/common/network-common/src/test/java/org/apache/spark/network/server/OneForOneStreamManagerSuite.java index c647525d8f..c647525d8f 100644 --- a/network/common/src/test/java/org/apache/spark/network/server/OneForOneStreamManagerSuite.java +++ b/common/network-common/src/test/java/org/apache/spark/network/server/OneForOneStreamManagerSuite.java diff --git a/network/common/src/test/java/org/apache/spark/network/util/TransportFrameDecoderSuite.java b/common/network-common/src/test/java/org/apache/spark/network/util/TransportFrameDecoderSuite.java index d4de4a941d..d4de4a941d 100644 --- a/network/common/src/test/java/org/apache/spark/network/util/TransportFrameDecoderSuite.java +++ b/common/network-common/src/test/java/org/apache/spark/network/util/TransportFrameDecoderSuite.java diff --git a/network/common/src/test/resources/log4j.properties b/common/network-common/src/test/resources/log4j.properties index e8da774f7c..e8da774f7c 100644 --- a/network/common/src/test/resources/log4j.properties +++ b/common/network-common/src/test/resources/log4j.properties diff --git a/network/shuffle/pom.xml b/common/network-shuffle/pom.xml index 810ec10ca0..810ec10ca0 100644 --- a/network/shuffle/pom.xml +++ b/common/network-shuffle/pom.xml diff --git a/network/shuffle/src/main/java/org/apache/spark/network/sasl/ShuffleSecretManager.java b/common/network-shuffle/src/main/java/org/apache/spark/network/sasl/ShuffleSecretManager.java index 351c7930a9..351c7930a9 100644 --- a/network/shuffle/src/main/java/org/apache/spark/network/sasl/ShuffleSecretManager.java +++ b/common/network-shuffle/src/main/java/org/apache/spark/network/sasl/ShuffleSecretManager.java diff --git a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/BlockFetchingListener.java b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/BlockFetchingListener.java index 138fd5389c..138fd5389c 100644 --- a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/BlockFetchingListener.java +++ b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/BlockFetchingListener.java diff --git a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleBlockHandler.java b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleBlockHandler.java index f22187a01d..f22187a01d 100644 --- a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleBlockHandler.java +++ b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleBlockHandler.java diff --git a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleBlockResolver.java b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleBlockResolver.java index fe933ed650..fe933ed650 100644 --- a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleBlockResolver.java +++ b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleBlockResolver.java diff --git a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleClient.java b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleClient.java index 58ca87d9d3..58ca87d9d3 100644 --- a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleClient.java +++ b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleClient.java diff --git a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/OneForOneBlockFetcher.java b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/OneForOneBlockFetcher.java index 1b2ddbf1ed..1b2ddbf1ed 100644 --- a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/OneForOneBlockFetcher.java +++ b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/OneForOneBlockFetcher.java diff --git a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/RetryingBlockFetcher.java b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/RetryingBlockFetcher.java index 4bb0498e5d..4bb0498e5d 100644 --- a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/RetryingBlockFetcher.java +++ b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/RetryingBlockFetcher.java diff --git a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/ShuffleClient.java b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/ShuffleClient.java index f72ab40690..f72ab40690 100644 --- a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/ShuffleClient.java +++ b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/ShuffleClient.java diff --git a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/mesos/MesosExternalShuffleClient.java b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/mesos/MesosExternalShuffleClient.java index 675820308b..675820308b 100644 --- a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/mesos/MesosExternalShuffleClient.java +++ b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/mesos/MesosExternalShuffleClient.java diff --git a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/BlockTransferMessage.java b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/BlockTransferMessage.java index 7fbe3384b4..7fbe3384b4 100644 --- a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/BlockTransferMessage.java +++ b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/BlockTransferMessage.java diff --git a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/ExecutorShuffleInfo.java b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/ExecutorShuffleInfo.java index 102d4efb8b..102d4efb8b 100644 --- a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/ExecutorShuffleInfo.java +++ b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/ExecutorShuffleInfo.java diff --git a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/OpenBlocks.java b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/OpenBlocks.java index ce954b8a28..ce954b8a28 100644 --- a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/OpenBlocks.java +++ b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/OpenBlocks.java diff --git a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/RegisterExecutor.java b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/RegisterExecutor.java index 167ef33104..167ef33104 100644 --- a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/RegisterExecutor.java +++ b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/RegisterExecutor.java diff --git a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/StreamHandle.java b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/StreamHandle.java index 1915295aa6..1915295aa6 100644 --- a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/StreamHandle.java +++ b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/StreamHandle.java diff --git a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/UploadBlock.java b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/UploadBlock.java index 3caed59d50..3caed59d50 100644 --- a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/UploadBlock.java +++ b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/UploadBlock.java diff --git a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/mesos/RegisterDriver.java b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/mesos/RegisterDriver.java index 94a61d6caa..94a61d6caa 100644 --- a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/mesos/RegisterDriver.java +++ b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/mesos/RegisterDriver.java diff --git a/network/shuffle/src/test/java/org/apache/spark/network/sasl/SaslIntegrationSuite.java b/common/network-shuffle/src/test/java/org/apache/spark/network/sasl/SaslIntegrationSuite.java index 0ea631ea14..0ea631ea14 100644 --- a/network/shuffle/src/test/java/org/apache/spark/network/sasl/SaslIntegrationSuite.java +++ b/common/network-shuffle/src/test/java/org/apache/spark/network/sasl/SaslIntegrationSuite.java diff --git a/network/shuffle/src/test/java/org/apache/spark/network/shuffle/BlockTransferMessagesSuite.java b/common/network-shuffle/src/test/java/org/apache/spark/network/shuffle/BlockTransferMessagesSuite.java index 86c8609e70..86c8609e70 100644 --- a/network/shuffle/src/test/java/org/apache/spark/network/shuffle/BlockTransferMessagesSuite.java +++ b/common/network-shuffle/src/test/java/org/apache/spark/network/shuffle/BlockTransferMessagesSuite.java diff --git a/network/shuffle/src/test/java/org/apache/spark/network/shuffle/ExternalShuffleBlockHandlerSuite.java b/common/network-shuffle/src/test/java/org/apache/spark/network/shuffle/ExternalShuffleBlockHandlerSuite.java index 9379412155..9379412155 100644 --- a/network/shuffle/src/test/java/org/apache/spark/network/shuffle/ExternalShuffleBlockHandlerSuite.java +++ b/common/network-shuffle/src/test/java/org/apache/spark/network/shuffle/ExternalShuffleBlockHandlerSuite.java diff --git a/network/shuffle/src/test/java/org/apache/spark/network/shuffle/ExternalShuffleBlockResolverSuite.java b/common/network-shuffle/src/test/java/org/apache/spark/network/shuffle/ExternalShuffleBlockResolverSuite.java index 60a1b8b045..60a1b8b045 100644 --- a/network/shuffle/src/test/java/org/apache/spark/network/shuffle/ExternalShuffleBlockResolverSuite.java +++ b/common/network-shuffle/src/test/java/org/apache/spark/network/shuffle/ExternalShuffleBlockResolverSuite.java diff --git a/network/shuffle/src/test/java/org/apache/spark/network/shuffle/ExternalShuffleCleanupSuite.java b/common/network-shuffle/src/test/java/org/apache/spark/network/shuffle/ExternalShuffleCleanupSuite.java index 532d7ab8d0..532d7ab8d0 100644 --- a/network/shuffle/src/test/java/org/apache/spark/network/shuffle/ExternalShuffleCleanupSuite.java +++ b/common/network-shuffle/src/test/java/org/apache/spark/network/shuffle/ExternalShuffleCleanupSuite.java diff --git a/network/shuffle/src/test/java/org/apache/spark/network/shuffle/ExternalShuffleIntegrationSuite.java b/common/network-shuffle/src/test/java/org/apache/spark/network/shuffle/ExternalShuffleIntegrationSuite.java index 5e706bf401..5e706bf401 100644 --- a/network/shuffle/src/test/java/org/apache/spark/network/shuffle/ExternalShuffleIntegrationSuite.java +++ b/common/network-shuffle/src/test/java/org/apache/spark/network/shuffle/ExternalShuffleIntegrationSuite.java diff --git a/network/shuffle/src/test/java/org/apache/spark/network/shuffle/ExternalShuffleSecuritySuite.java b/common/network-shuffle/src/test/java/org/apache/spark/network/shuffle/ExternalShuffleSecuritySuite.java index 08ddb3755b..08ddb3755b 100644 --- a/network/shuffle/src/test/java/org/apache/spark/network/shuffle/ExternalShuffleSecuritySuite.java +++ b/common/network-shuffle/src/test/java/org/apache/spark/network/shuffle/ExternalShuffleSecuritySuite.java diff --git a/network/shuffle/src/test/java/org/apache/spark/network/shuffle/OneForOneBlockFetcherSuite.java b/common/network-shuffle/src/test/java/org/apache/spark/network/shuffle/OneForOneBlockFetcherSuite.java index 2590b9ce4c..2590b9ce4c 100644 --- a/network/shuffle/src/test/java/org/apache/spark/network/shuffle/OneForOneBlockFetcherSuite.java +++ b/common/network-shuffle/src/test/java/org/apache/spark/network/shuffle/OneForOneBlockFetcherSuite.java diff --git a/network/shuffle/src/test/java/org/apache/spark/network/shuffle/RetryingBlockFetcherSuite.java b/common/network-shuffle/src/test/java/org/apache/spark/network/shuffle/RetryingBlockFetcherSuite.java index 3a6ef0d3f8..3a6ef0d3f8 100644 --- a/network/shuffle/src/test/java/org/apache/spark/network/shuffle/RetryingBlockFetcherSuite.java +++ b/common/network-shuffle/src/test/java/org/apache/spark/network/shuffle/RetryingBlockFetcherSuite.java diff --git a/network/shuffle/src/test/java/org/apache/spark/network/shuffle/TestShuffleDataContext.java b/common/network-shuffle/src/test/java/org/apache/spark/network/shuffle/TestShuffleDataContext.java index 7ac1ca128a..7ac1ca128a 100644 --- a/network/shuffle/src/test/java/org/apache/spark/network/shuffle/TestShuffleDataContext.java +++ b/common/network-shuffle/src/test/java/org/apache/spark/network/shuffle/TestShuffleDataContext.java diff --git a/network/yarn/pom.xml b/common/network-yarn/pom.xml index 3cb44324f2..3cb44324f2 100644 --- a/network/yarn/pom.xml +++ b/common/network-yarn/pom.xml diff --git a/network/yarn/src/main/java/org/apache/spark/network/yarn/YarnShuffleService.java b/common/network-yarn/src/main/java/org/apache/spark/network/yarn/YarnShuffleService.java index ba6d30a74c..ba6d30a74c 100644 --- a/network/yarn/src/main/java/org/apache/spark/network/yarn/YarnShuffleService.java +++ b/common/network-yarn/src/main/java/org/apache/spark/network/yarn/YarnShuffleService.java diff --git a/network/yarn/src/main/java/org/apache/spark/network/yarn/util/HadoopConfigProvider.java b/common/network-yarn/src/main/java/org/apache/spark/network/yarn/util/HadoopConfigProvider.java index 884861752e..884861752e 100644 --- a/network/yarn/src/main/java/org/apache/spark/network/yarn/util/HadoopConfigProvider.java +++ b/common/network-yarn/src/main/java/org/apache/spark/network/yarn/util/HadoopConfigProvider.java diff --git a/dev/sparktestsupport/modules.py b/dev/sparktestsupport/modules.py index 07c3078e45..4e04672ad3 100644 --- a/dev/sparktestsupport/modules.py +++ b/dev/sparktestsupport/modules.py @@ -473,11 +473,11 @@ yarn = Module( dependencies=[], source_file_regexes=[ "yarn/", - "network/yarn/", + "common/network-yarn/", ], sbt_test_goals=[ "yarn/test", - "network-yarn/test", + "common/network-yarn/test", ], test_tags=[ "org.apache.spark.tags.ExtendedYarnTest" diff --git a/docs/job-scheduling.md b/docs/job-scheduling.md index 00b6a18836..083c020caa 100644 --- a/docs/job-scheduling.md +++ b/docs/job-scheduling.md @@ -88,7 +88,7 @@ In YARN mode, start the shuffle service on each `NodeManager` as follows: 1. Build Spark with the [YARN profile](building-spark.html). Skip this step if you are using a pre-packaged distribution. 2. Locate the `spark-<version>-yarn-shuffle.jar`. This should be under -`$SPARK_HOME/network/yarn/target/scala-<version>` if you are building Spark yourself, and under +`$SPARK_HOME/common/network-yarn/target/scala-<version>` if you are building Spark yourself, and under `lib` if you are using a distribution. 2. Add this jar to the classpath of all `NodeManager`s in your cluster. 3. In the `yarn-site.xml` on each node, add `spark_shuffle` to `yarn.nodemanager.aux-services`, diff --git a/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java b/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java index 68af14397b..45c2c008f6 100644 --- a/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java +++ b/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java @@ -148,7 +148,8 @@ abstract class AbstractCommandBuilder { String scala = getScalaVersion(); List<String> projects = Arrays.asList("core", "repl", "mllib", "graphx", "streaming", "tools", "sql/catalyst", "sql/core", "sql/hive", "sql/hive-thriftserver", - "yarn", "launcher", "network/common", "network/shuffle", "network/yarn"); + "yarn", "launcher", + "common/network-common", "common/network-shuffle", "common/network-yarn"); if (prependClasses) { if (!isTesting) { System.err.println( diff --git a/make-distribution.sh b/make-distribution.sh index 20998144f0..ac90ea317a 100755 --- a/make-distribution.sh +++ b/make-distribution.sh @@ -169,7 +169,7 @@ cp "$SPARK_HOME"/assembly/target/scala*/*assembly*hadoop*.jar "$DISTDIR/lib/" cp "$SPARK_HOME"/examples/target/scala*/spark-examples*.jar "$DISTDIR/lib/" # This will fail if the -Pyarn profile is not provided # In this case, silence the error and ignore the return code of this command -cp "$SPARK_HOME"/network/yarn/target/scala*/spark-*-yarn-shuffle.jar "$DISTDIR/lib/" &> /dev/null || : +cp "$SPARK_HOME"/common/network-yarn/target/scala*/spark-*-yarn-shuffle.jar "$DISTDIR/lib/" &> /dev/null || : # Copy example sources (needed for python and SQL) mkdir -p "$DISTDIR/examples/src/main" @@ -87,13 +87,13 @@ <modules> <module>common/sketch</module> + <module>common/network-common</module> + <module>common/network-shuffle</module> <module>tags</module> <module>core</module> <module>graphx</module> <module>mllib</module> <module>tools</module> - <module>network/common</module> - <module>network/shuffle</module> <module>streaming</module> <module>sql/catalyst</module> <module>sql/core</module> @@ -2442,7 +2442,7 @@ <id>yarn</id> <modules> <module>yarn</module> - <module>network/yarn</module> + <module>common/network-yarn</module> </modules> </profile> |