aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Wendell <pwendell@gmail.com>2014-01-12 19:16:43 -0800
committerPatrick Wendell <pwendell@gmail.com>2014-01-12 19:16:43 -0800
commit2802cc80bcf267fd19a4cb43da505b82af675e08 (patch)
tree8cb86d469d17b523484047d7aa2635915e33d380
parent288a878999848adb130041d1e40c14bfc879cec6 (diff)
downloadspark-2802cc80bcf267fd19a4cb43da505b82af675e08.tar.gz
spark-2802cc80bcf267fd19a4cb43da505b82af675e08.tar.bz2
spark-2802cc80bcf267fd19a4cb43da505b82af675e08.zip
Disable shuffle file consolidation by default
-rw-r--r--core/src/main/scala/org/apache/spark/storage/ShuffleBlockManager.scala2
-rw-r--r--docs/configuration.md2
2 files changed, 2 insertions, 2 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 6e0ff143b7..e2b24298a5 100644
--- a/core/src/main/scala/org/apache/spark/storage/ShuffleBlockManager.scala
+++ b/core/src/main/scala/org/apache/spark/storage/ShuffleBlockManager.scala
@@ -64,7 +64,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 =
- conf.getBoolean("spark.shuffle.consolidateFiles", true)
+ conf.getBoolean("spark.shuffle.consolidateFiles", false)
private val bufferSize = conf.getInt("spark.shuffle.file.buffer.kb", 100) * 1024
diff --git a/docs/configuration.md b/docs/configuration.md
index ad75e06fc7..40a57c4bc6 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -382,7 +382,7 @@ Apart from these, the following properties are also available, and may be useful
<tr>
<td>spark.shuffle.consolidateFiles</td>
- <td>true</td>
+ <td>false</td>
<td>
If set to "true", consolidates intermediate files created during a shuffle. Creating fewer files can improve filesystem performance for shuffles with large numbers of reduce tasks. It is recommended to set this to "true" when using ext4 or xfs filesystems. On ext3, this option might degrade performance on machines with many (>8) cores due to filesystem limitations.
</td>