Updated Branches:
refs/heads/master 0ff38c222 -> ac712e48a
Merge pull request #524 from rxin/doc
Added spark.shuffle.file.buffer.kb to configuration doc.
Author: Reynold Xin <r...@apache.org>
== Merge branch commits ==
commit 0eea1d761ff772ff89be234e1e28035d54e5a7de
Author: Reynold Xin <r...@apache.org>
Date: Wed Jan 29 14:40:48 2014 -0800
Added spark.shuffle.file.buffer.kb to configuration doc.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/ac712e48
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/ac712e48
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/ac712e48
Branch: refs/heads/master
Commit: ac712e48af3068672e629cec7766caae3cd77c37
Parents: 0ff38c2
Author: Reynold Xin <r...@apache.org>
Authored: Thu Jan 30 09:33:18 2014 -0800
Committer: Reynold Xin <r...@apache.org>
Committed: Thu Jan 30 09:33:18 2014 -0800
----------------------------------------------------------------------
docs/configuration.md | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/ac712e48/docs/configuration.md
----------------------------------------------------------------------
diff --git a/docs/configuration.md b/docs/configuration.md
index 4bb5371..1f9fa70 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -399,6 +399,14 @@ Apart from these, the following properties are also
available, and may be useful
</td>
</tr>
<tr>
+ <td>spark.shuffle.file.buffer.kb</td>
+ <td>100</td>
+ <td>
+ Size of the in-memory buffer for each shuffle file output stream, in
kilobytes. These buffers
+ reduce the number of disk seeks and system calls made in creating
intermediate shuffle files.
+ </td>
+</tr>
+<tr>
<td>spark.shuffle.spill</td>
<td>true</td>
<td>
