diff options
| author | Reynold Xin <rxin@databricks.com> | 2015-08-14 20:55:32 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@databricks.com> | 2015-08-14 20:55:32 -0700 |
| commit | e5fd60415fbfea2c5c02602f7ddbc999dd058064 (patch) | |
| tree | 742ce6217f89e952f61fff97072d7ec6e9694990 | |
| parent | 932b24fd144232fb08184f0bd0a46369ecba164e (diff) | |
| download | spark-e5fd60415fbfea2c5c02602f7ddbc999dd058064.tar.gz spark-e5fd60415fbfea2c5c02602f7ddbc999dd058064.tar.bz2 spark-e5fd60415fbfea2c5c02602f7ddbc999dd058064.zip | |
[SPARK-9934] Deprecate NIO ConnectionManager.
Deprecate NIO ConnectionManager in Spark 1.5.0, before removing it in Spark 1.6.0.
Author: Reynold Xin <rxin@databricks.com>
Closes #8162 from rxin/SPARK-9934.
| -rw-r--r-- | core/src/main/scala/org/apache/spark/SparkEnv.scala | 2 | ||||
| -rw-r--r-- | docs/configuration.md | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/core/src/main/scala/org/apache/spark/SparkEnv.scala b/core/src/main/scala/org/apache/spark/SparkEnv.scala index a796e72850..0f1e2e0695 100644 --- a/core/src/main/scala/org/apache/spark/SparkEnv.scala +++ b/core/src/main/scala/org/apache/spark/SparkEnv.scala @@ -331,6 +331,8 @@ object SparkEnv extends Logging { case "netty" => new NettyBlockTransferService(conf, securityManager, numUsableCores) case "nio" => + logWarning("NIO-based block transfer service is deprecated, " + + "and will be removed in Spark 1.6.0.") new NioBlockTransferService(conf, securityManager) } diff --git a/docs/configuration.md b/docs/configuration.md index c60dd16839..32147098ae 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -389,7 +389,8 @@ Apart from these, the following properties are also available, and may be useful Implementation to use for transferring shuffle and cached blocks between executors. There are two implementations available: <code>netty</code> and <code>nio</code>. Netty-based block transfer is intended to be simpler but equally efficient and is the default option - starting in 1.2. + starting in 1.2, and <code>nio</code> block transfer is deprecated in Spark 1.5.0 and will + be removed in Spark 1.6.0. </td> </tr> <tr> |