Repository: spark Updated Branches: refs/heads/master 642b246be -> e7f4ea8a5
[SPARK-3890][Docs]remove redundant spark.executor.memory in doc Introduced in https://github.com/pwendell/spark/commit/f7e79bc42c1635686c3af01eef147dae92de2529, I'm not sure why we need two spark.executor.memory here. Author: WangTaoTheTonic <[email protected]> Author: WangTao <[email protected]> Closes #2745 from WangTaoTheTonic/redundantconfig and squashes the following commits: e7564dc [WangTao] too long line fdbdb1f [WangTaoTheTonic] trivial workaround d06b6e5 [WangTaoTheTonic] remove redundant spark.executor.memory in doc Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/e7f4ea8a Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/e7f4ea8a Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/e7f4ea8a Branch: refs/heads/master Commit: e7f4ea8a52f0d3d56684b4f9caadce978eac4816 Parents: 642b246 Author: WangTaoTheTonic <[email protected]> Authored: Thu Oct 16 19:12:39 2014 -0700 Committer: Andrew Or <[email protected]> Committed: Thu Oct 16 19:12:57 2014 -0700 ---------------------------------------------------------------------- docs/configuration.md | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/e7f4ea8a/docs/configuration.md ---------------------------------------------------------------------- diff --git a/docs/configuration.md b/docs/configuration.md index 8515ee0..f0204c6 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -162,14 +162,6 @@ Apart from these, the following properties are also available, and may be useful <table class="table"> <tr><th>Property Name</th><th>Default</th><th>Meaning</th></tr> <tr> - <td><code>spark.executor.memory</code></td> - <td>512m</td> - <td> - Amount of memory to use per executor process, in the same format as JVM memory strings - (e.g. <code>512m</code>, <code>2g</code>). - </td> -</tr> -<tr> <td><code>spark.executor.extraJavaOptions</code></td> <td>(none)</td> <td> @@ -365,7 +357,7 @@ Apart from these, the following properties are also available, and may be useful <td><code>spark.ui.port</code></td> <td>4040</td> <td> - Port for your application's dashboard, which shows memory and workload data + Port for your application's dashboard, which shows memory and workload data. </td> </tr> <tr> @@ -880,8 +872,8 @@ Apart from these, the following properties are also available, and may be useful <td><code>spark.scheduler.revive.interval</code></td> <td>1000</td> <td> - The interval length for the scheduler to revive the worker resource offers to run tasks. - (in milliseconds) + The interval length for the scheduler to revive the worker resource offers to run tasks + (in milliseconds). </td> </tr> </tr> @@ -893,7 +885,7 @@ Apart from these, the following properties are also available, and may be useful to wait for before scheduling begins. Specified as a double between 0 and 1. Regardless of whether the minimum ratio of resources has been reached, the maximum amount of time it will wait before scheduling begins is controlled by config - <code>spark.scheduler.maxRegisteredResourcesWaitingTime</code> + <code>spark.scheduler.maxRegisteredResourcesWaitingTime</code>. </td> </tr> <tr> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
