diff options
| author | Aaron Davidson <aaron@databricks.com> | 2014-12-18 16:43:16 -0800 |
|---|---|---|
| committer | Josh Rosen <joshrosen@databricks.com> | 2014-12-18 16:43:59 -0800 |
| commit | 075b399c59b508251f4fb259e7b0c13b79ff5883 (patch) | |
| tree | 8bbb79729df4c7d50478f33b7219351304ecc173 /core | |
| parent | 61c9b89d84c868e9ecf5cffb9718c46753c9996e (diff) | |
| download | spark-075b399c59b508251f4fb259e7b0c13b79ff5883.tar.gz spark-075b399c59b508251f4fb259e7b0c13b79ff5883.tar.bz2 spark-075b399c59b508251f4fb259e7b0c13b79ff5883.zip | |
[SPARK-4837] NettyBlockTransferService should use spark.blockManager.port config
This is used in NioBlockTransferService here:
https://github.com/apache/spark/blob/master/core/src/main/scala/org/apache/spark/network/nio/NioBlockTransferService.scala#L66
Author: Aaron Davidson <aaron@databricks.com>
Closes #3688 from aarondav/SPARK-4837 and squashes the following commits:
ebd2007 [Aaron Davidson] [SPARK-4837] NettyBlockTransferService should use spark.blockManager.port config
(cherry picked from commit 105293a7d06b26e7b179a0447eb802074ee9c218)
Signed-off-by: Josh Rosen <joshrosen@databricks.com>
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/network/netty/NettyBlockTransferService.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/main/scala/org/apache/spark/network/netty/NettyBlockTransferService.scala b/core/src/main/scala/org/apache/spark/network/netty/NettyBlockTransferService.scala index 0027cbb0ff..3f0950dae1 100644 --- a/core/src/main/scala/org/apache/spark/network/netty/NettyBlockTransferService.scala +++ b/core/src/main/scala/org/apache/spark/network/netty/NettyBlockTransferService.scala @@ -60,7 +60,7 @@ class NettyBlockTransferService(conf: SparkConf, securityManager: SecurityManage } transportContext = new TransportContext(transportConf, rpcHandler) clientFactory = transportContext.createClientFactory(bootstrap.toList) - server = transportContext.createServer() + server = transportContext.createServer(conf.getInt("spark.blockManager.port", 0)) appId = conf.getAppId logInfo("Server created on " + server.getPort) } |