diff --git a/conf/spark-env.sh.template b/conf/spark-env.sh.template index 192d3ae09113471612ad80c8cbe567ac93783a9d..c05fe381a36a79240d905321cba40b87d4cdfbed 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") diff --git a/docs/monitoring.md b/docs/monitoring.md index bcf885fe4e681669d9d12e4ad4b114a407f52a8c..cedceb29580233d697f13159f1107a636af399ff 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> diff --git a/docs/spark-standalone.md b/docs/spark-standalone.md index 4f71fbc086cd03fd1966755627d959ecc04475a7..2fe9ec3542b28c18dffa4b11f3a9211b9aa9bb6e 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>