Repository: spark Updated Branches: refs/heads/branch-1.5 6be945cef -> d84291713
[SPARK-9934] Deprecate NIO ConnectionManager. Deprecate NIO ConnectionManager in Spark 1.5.0, before removing it in Spark 1.6.0. Author: Reynold Xin <[email protected]> Closes #8162 from rxin/SPARK-9934. (cherry picked from commit e5fd60415fbfea2c5c02602f7ddbc999dd058064) Signed-off-by: Reynold Xin <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/d8429171 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/d8429171 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/d8429171 Branch: refs/heads/branch-1.5 Commit: d84291713c48a0129619e3642e87337a03f14e07 Parents: 6be945c Author: Reynold Xin <[email protected]> Authored: Fri Aug 14 20:55:32 2015 -0700 Committer: Reynold Xin <[email protected]> Committed: Fri Aug 14 20:55:48 2015 -0700 ---------------------------------------------------------------------- core/src/main/scala/org/apache/spark/SparkEnv.scala | 2 ++ docs/configuration.md | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/d8429171/core/src/main/scala/org/apache/spark/SparkEnv.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/SparkEnv.scala b/core/src/main/scala/org/apache/spark/SparkEnv.scala index a796e72..0f1e2e0 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) } http://git-wip-us.apache.org/repos/asf/spark/blob/d8429171/docs/configuration.md ---------------------------------------------------------------------- diff --git a/docs/configuration.md b/docs/configuration.md index c60dd16..3214709 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> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
