aboutsummaryrefslogtreecommitdiff
path: root/docs/running-on-mesos.md
diff options
context:
space:
mode:
authorJongyoul Lee <jongyoul@gmail.com>2015-03-20 19:14:35 +0000
committerSean Owen <sowen@cloudera.com>2015-03-20 19:14:35 +0000
commit49a01c7ea2c48feee7ab4551c4fa03fd1cdb1a32 (patch)
treea3f87c2e82480db362539920d911c3212096df22 /docs/running-on-mesos.md
parent6b36470c66bd6140c45e45d3f1d51b0082c3fd97 (diff)
downloadspark-49a01c7ea2c48feee7ab4551c4fa03fd1cdb1a32.tar.gz
spark-49a01c7ea2c48feee7ab4551c4fa03fd1cdb1a32.tar.bz2
spark-49a01c7ea2c48feee7ab4551c4fa03fd1cdb1a32.zip
[SPARK-6423][Mesos] MemoryUtils should use memoryOverhead if it's set
- Fixed calculateTotalMemory to use spark.mesos.executor.memoryOverhead - Added testCase Author: Jongyoul Lee <jongyoul@gmail.com> Closes #5099 from jongyoul/SPARK-6423 and squashes the following commits: 6747fce [Jongyoul Lee] [SPARK-6423][Mesos] MemoryUtils should use memoryOverhead if it's set - Changed a description of spark.mesos.executor.memoryOverhead 475a7c8 [Jongyoul Lee] [SPARK-6423][Mesos] MemoryUtils should use memoryOverhead if it's set - Fit the import rules 453c5a2 [Jongyoul Lee] [SPARK-6423][Mesos] MemoryUtils should use memoryOverhead if it's set - Fixed calculateTotalMemory to use spark.mesos.executor.memoryOverhead - Added testCase
Diffstat (limited to 'docs/running-on-mesos.md')
-rw-r--r--docs/running-on-mesos.md8
1 files changed, 3 insertions, 5 deletions
diff --git a/docs/running-on-mesos.md b/docs/running-on-mesos.md
index 6a9d304501..c984639bd3 100644
--- a/docs/running-on-mesos.md
+++ b/docs/running-on-mesos.md
@@ -224,11 +224,9 @@ See the [configuration page](configuration.html) for information on Spark config
<td><code>spark.mesos.executor.memoryOverhead</code></td>
<td>executor memory * 0.10, with minimum of 384</td>
<td>
- This value is an additive for <code>spark.executor.memory</code>, specified in MB,
- which is used to calculate the total Mesos task memory. A value of <code>384</code>
- implies a 384MB overhead. Additionally, there is a hard-coded 10% minimum
- overhead. The final overhead will be the larger of either
- `spark.mesos.executor.memoryOverhead` or 10% of `spark.executor.memory`.
+ The amount of additional memory, specified in MB, to be allocated per executor. By default,
+ the overhead will be larger of either 384 or 10% of `spark.executor.memory`. If it's set,
+ the final overhead will be this value.
</td>
</tr>
</table>