diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2013-12-05 12:31:24 -0800 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2013-12-05 12:31:24 -0800 |
| commit | 5d460253d6080d871cb71efb112ea17be0873771 (patch) | |
| tree | b6f2db0b07ed9d9e58384f0e3a48ab1cc26debe2 /core/src/main/scala/org | |
| parent | 72b696156c8662cae2cef4b943520b4be86148ea (diff) | |
| parent | 75d161b35702b6790aa66fff06b07f306442f5a3 (diff) | |
| download | spark-5d460253d6080d871cb71efb112ea17be0873771.tar.gz spark-5d460253d6080d871cb71efb112ea17be0873771.tar.bz2 spark-5d460253d6080d871cb71efb112ea17be0873771.zip | |
Merge pull request #228 from pwendell/master
Document missing configs and set shuffle consolidation to false.
Diffstat (limited to 'core/src/main/scala/org')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/storage/ShuffleBlockManager.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/main/scala/org/apache/spark/storage/ShuffleBlockManager.scala b/core/src/main/scala/org/apache/spark/storage/ShuffleBlockManager.scala index 2f1b049ce4..e828e1d1c5 100644 --- a/core/src/main/scala/org/apache/spark/storage/ShuffleBlockManager.scala +++ b/core/src/main/scala/org/apache/spark/storage/ShuffleBlockManager.scala @@ -62,7 +62,7 @@ class ShuffleBlockManager(blockManager: BlockManager) { // Turning off shuffle file consolidation causes all shuffle Blocks to get their own file. // TODO: Remove this once the shuffle file consolidation feature is stable. val consolidateShuffleFiles = - System.getProperty("spark.shuffle.consolidateFiles", "true").toBoolean + System.getProperty("spark.shuffle.consolidateFiles", "false").toBoolean private val bufferSize = System.getProperty("spark.shuffle.file.buffer.kb", "100").toInt * 1024 |