diff options
| author | EugenCepoi <cepoi.eugen@gmail.com> | 2014-10-03 10:03:15 -0700 |
|---|---|---|
| committer | Andrew Or <andrewor14@gmail.com> | 2014-10-03 10:03:24 -0700 |
| commit | 5d991db8a84a62705efa41c9c8a215569ad648fe (patch) | |
| tree | aec81d678bc8b303888fb3ffc2d14a4cfd60264c /docs/configuration.md | |
| parent | 699af62dcb480230bd1a3ae82130080d325aa0d1 (diff) | |
| download | spark-5d991db8a84a62705efa41c9c8a215569ad648fe.tar.gz spark-5d991db8a84a62705efa41c9c8a215569ad648fe.tar.bz2 spark-5d991db8a84a62705efa41c9c8a215569ad648fe.zip | |
SPARK-2058: Overriding SPARK_HOME/conf with SPARK_CONF_DIR
Update of PR #997.
With this PR, setting SPARK_CONF_DIR overrides SPARK_HOME/conf (not only spark-defaults.conf and spark-env).
Author: EugenCepoi <cepoi.eugen@gmail.com>
Closes #2481 from EugenCepoi/SPARK-2058 and squashes the following commits:
0bb32c2 [EugenCepoi] use orElse orNull and fixing trailing percent in compute-classpath.cmd
77f35d7 [EugenCepoi] SPARK-2058: Overriding SPARK_HOME/conf with SPARK_CONF_DIR
(cherry picked from commit f0811f928e5b608e1a2cba3b6828ba0ed03b701d)
Signed-off-by: Andrew Or <andrewor14@gmail.com>
Diffstat (limited to 'docs/configuration.md')
| -rw-r--r-- | docs/configuration.md | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/docs/configuration.md b/docs/configuration.md index 9411230b0e..c5065709f6 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -1079,3 +1079,10 @@ compute `SPARK_LOCAL_IP` by looking up the IP of a specific network interface. Spark uses [log4j](http://logging.apache.org/log4j/) for logging. You can configure it by adding a `log4j.properties` file in the `conf` directory. One way to start is to copy the existing `log4j.properties.template` located there. + +# Overriding configuration directory + +To specify a different configuration directory other than the default "SPARK_HOME/conf", +you can set SPARK_CONF_DIR. Spark will use the the configuration files (spark-defaults.conf, spark-env.sh, log4j.properties, etc) +from this directory. + |