aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorPatrick Wendell <pwendell@gmail.com>2013-12-04 18:39:34 -0800
committerPatrick Wendell <pwendell@gmail.com>2013-12-04 18:39:34 -0800
commitb1c6fa1584099b3a1e0615c100f10ea90b1ad2c9 (patch)
treed270cead92f1322556995aa89dfd6fabaa3e616a /core
parent380b90b9b360db9cb6a4edc1312704afe11eb31d (diff)
downloadspark-b1c6fa1584099b3a1e0615c100f10ea90b1ad2c9.tar.gz
spark-b1c6fa1584099b3a1e0615c100f10ea90b1ad2c9.tar.bz2
spark-b1c6fa1584099b3a1e0615c100f10ea90b1ad2c9.zip
Document missing configs and set shuffle consolidation to false.
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/org/apache/spark/storage/ShuffleBlockManager.scala2
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