Repository: spark Updated Branches: refs/heads/master ff9169a00 -> ba1c4e138
[SPARK-9558][DOCS]Update docs to follow the increase of memory defaults. Now the memory defaults of master and slave in Standalone mode and History Server is 1g, not 512m. So let's update docs. Author: Kousuke Saruta <saru...@oss.nttdata.co.jp> Closes #7896 from sarutak/update-doc-for-daemon-memory and squashes the following commits: a77626c [Kousuke Saruta] Fix docs to follow the update of increase of memory defaults Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/ba1c4e13 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/ba1c4e13 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/ba1c4e13 Branch: refs/heads/master Commit: ba1c4e138de2ea84b55def4eed2bd363e60aea4d Parents: ff9169a Author: Kousuke Saruta <saru...@oss.nttdata.co.jp> Authored: Mon Aug 3 12:53:44 2015 -0700 Committer: Reynold Xin <r...@databricks.com> Committed: Mon Aug 3 12:53:44 2015 -0700 ---------------------------------------------------------------------- conf/spark-env.sh.template | 1 + docs/monitoring.md | 2 +- docs/spark-standalone.md | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/ba1c4e13/conf/spark-env.sh.template ---------------------------------------------------------------------- diff --git a/conf/spark-env.sh.template b/conf/spark-env.sh.template index 192d3ae..c05fe38 100755 --- a/conf/spark-env.sh.template +++ b/conf/spark-env.sh.template @@ -38,6 +38,7 @@ # - SPARK_WORKER_INSTANCES, to set the number of worker processes per node # - SPARK_WORKER_DIR, to set the working directory of worker processes # - SPARK_WORKER_OPTS, to set config properties only for the worker (e.g. "-Dx=y") +# - SPARK_DAEMON_MEMORY, to allocate to the master, worker and history server themselves (default: 1g). # - SPARK_HISTORY_OPTS, to set config properties only for the history server (e.g. "-Dx=y") # - SPARK_SHUFFLE_OPTS, to set config properties only for the external shuffle service (e.g. "-Dx=y") # - SPARK_DAEMON_JAVA_OPTS, to set config properties for all daemons (e.g. "-Dx=y") http://git-wip-us.apache.org/repos/asf/spark/blob/ba1c4e13/docs/monitoring.md ---------------------------------------------------------------------- diff --git a/docs/monitoring.md b/docs/monitoring.md index bcf885f..cedceb2 100644 --- a/docs/monitoring.md +++ b/docs/monitoring.md @@ -48,7 +48,7 @@ follows: <tr><th style="width:21%">Environment Variable</th><th>Meaning</th></tr> <tr> <td><code>SPARK_DAEMON_MEMORY</code></td> - <td>Memory to allocate to the history server (default: 512m).</td> + <td>Memory to allocate to the history server (default: 1g).</td> </tr> <tr> <td><code>SPARK_DAEMON_JAVA_OPTS</code></td> http://git-wip-us.apache.org/repos/asf/spark/blob/ba1c4e13/docs/spark-standalone.md ---------------------------------------------------------------------- diff --git a/docs/spark-standalone.md b/docs/spark-standalone.md index 4f71fbc..2fe9ec3 100644 --- a/docs/spark-standalone.md +++ b/docs/spark-standalone.md @@ -152,7 +152,7 @@ You can optionally configure the cluster further by setting environment variable </tr> <tr> <td><code>SPARK_DAEMON_MEMORY</code></td> - <td>Memory to allocate to the Spark master and worker daemons themselves (default: 512m).</td> + <td>Memory to allocate to the Spark master and worker daemons themselves (default: 1g).</td> </tr> <tr> <td><code>SPARK_DAEMON_JAVA_OPTS</code></td> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
