diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2014-11-01 15:18:58 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-11-01 15:18:58 -0700 |
| commit | 7894de276b8d0b0e4efc654d0b254fc2a6f6077c (patch) | |
| tree | 5a73de78434ac4a92ae4e7b7e609b9eff6f5d850 /core/src | |
| parent | ad0fde10b2285e780349be5a8f333db0974a502f (diff) | |
| download | spark-7894de276b8d0b0e4efc654d0b254fc2a6f6077c.tar.gz spark-7894de276b8d0b0e4efc654d0b254fc2a6f6077c.tar.bz2 spark-7894de276b8d0b0e4efc654d0b254fc2a6f6077c.zip | |
Revert "[SPARK-4183] Enable NettyBlockTransferService by default"
This reverts commit 59e626c701227634336110e1bc23afd94c535ede.
Diffstat (limited to 'core/src')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/SparkEnv.scala | 2 |
1 files changed, 1 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 e2f13accdf..7fb2b91377 100644 --- a/core/src/main/scala/org/apache/spark/SparkEnv.scala +++ b/core/src/main/scala/org/apache/spark/SparkEnv.scala @@ -274,7 +274,7 @@ object SparkEnv extends Logging { val shuffleMemoryManager = new ShuffleMemoryManager(conf) val blockTransferService = - conf.get("spark.shuffle.blockTransferService", "netty").toLowerCase match { + conf.get("spark.shuffle.blockTransferService", "nio").toLowerCase match { case "netty" => new NettyBlockTransferService(conf) case "nio" => |