diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-09-01 22:12:03 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-09-01 22:12:03 -0700 |
| commit | 9ee1e9db2ea4ae4794817ee6b4603ba869aaa7d4 (patch) | |
| tree | a0161b7bed5e4a9e37b3a6b079f827a88b1fd2e7 /docs/configuration.md | |
| parent | 141f54279e538e36e0506eb37b51df90dfa27358 (diff) | |
| download | spark-9ee1e9db2ea4ae4794817ee6b4603ba869aaa7d4.tar.gz spark-9ee1e9db2ea4ae4794817ee6b4603ba869aaa7d4.tar.bz2 spark-9ee1e9db2ea4ae4794817ee6b4603ba869aaa7d4.zip | |
Doc improvements
Diffstat (limited to 'docs/configuration.md')
| -rw-r--r-- | docs/configuration.md | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/configuration.md b/docs/configuration.md index 58e9434bdc..aaf85ed4f4 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -315,7 +315,7 @@ Apart from these, the following properties are also available, and may be useful # Environment Variables Certain Spark settings can also be configured through environment variables, which are read from the `conf/spark-env.sh` -script in the directory where Spark is installed. These variables are meant to be for machine-specific settings, such +script in the directory where Spark is installed (or `conf/spark-env.cmd` on Windows). These variables are meant to be for machine-specific settings, such as library search paths. While Java system properties can also be set here, for application settings, we recommend setting these properties within the application instead of in `spark-env.sh` so that different applications can use different settings. @@ -325,6 +325,8 @@ Note that `conf/spark-env.sh` does not exist by default when Spark is installed. The following variables can be set in `spark-env.sh`: +* `JAVA_HOME`, the location where Java is installed (if it's not on your default `PATH`) +* `PYSPARK_PYTHON`, the Python binary to use for PySpark * `SPARK_LOCAL_IP`, to configure which IP address of the machine to bind to. * `SPARK_LIBRARY_PATH`, to add search directories for native libraries. * `SPARK_CLASSPATH`, to add elements to Spark's classpath that you want to be present for _all_ applications. |