Updated Branches:
refs/heads/branch-0.9 a41a83cd6 -> a414071f2
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.
(cherry picked from commit ac712e48af3068672e629cec7766caae3cd77c37)
Signed-off-by: Patrick Wendell <pwend...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/a414071f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/a414071f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/a414071f
Branch: refs/heads/branch-0.9
Commit: a414071f25d21dbdaa0b477ac29f45ec677ffc38
Parents: a41a83c
Author: Reynold Xin <r...@apache.org>
Authored: Thu Jan 30 09:33:18 2014 -0800
Committer: Patrick Wendell <pwend...@gmail.com>
Committed: Fri Jan 31 16:54:33 2014 -0800
----------------------------------------------------------------------
docs/configuration.md | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/a414071f/docs/configuration.md
----------------------------------------------------------------------
diff --git a/docs/configuration.md b/docs/configuration.md
index 0cf9d23..7fb4f26 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>
