diff options
| author | WangTaoTheTonic <barneystinson@aliyun.com> | 2014-10-03 10:42:41 -0700 |
|---|---|---|
| committer | Andrew Or <andrewor14@gmail.com> | 2014-10-03 10:42:41 -0700 |
| commit | 9d320e222c221e5bb827cddf01a83e64a16d74ff (patch) | |
| tree | 570e6577364abf2478bccd1fd18776bd6cd74272 /sbin | |
| parent | f0811f928e5b608e1a2cba3b6828ba0ed03b701d (diff) | |
| download | spark-9d320e222c221e5bb827cddf01a83e64a16d74ff.tar.gz spark-9d320e222c221e5bb827cddf01a83e64a16d74ff.tar.bz2 spark-9d320e222c221e5bb827cddf01a83e64a16d74ff.zip | |
[SPARK-3696]Do not override the user-difined conf_dir
https://issues.apache.org/jira/browse/SPARK-3696
We see if SPARK_CONF_DIR is already defined before assignment.
Author: WangTaoTheTonic <barneystinson@aliyun.com>
Closes #2541 from WangTaoTheTonic/confdir and squashes the following commits:
c3f31e0 [WangTaoTheTonic] Do not override the user-difined conf_dir
Diffstat (limited to 'sbin')
| -rwxr-xr-x | sbin/spark-config.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sbin/spark-config.sh b/sbin/spark-config.sh index 2718d6cba1..1d154e62ed 100755 --- a/sbin/spark-config.sh +++ b/sbin/spark-config.sh @@ -33,7 +33,7 @@ this="$config_bin/$script" export SPARK_PREFIX="`dirname "$this"`"/.. export SPARK_HOME="${SPARK_PREFIX}" -export SPARK_CONF_DIR="$SPARK_HOME/conf" +export SPARK_CONF_DIR="${SPARK_CONF_DIR:-"$SPARK_HOME/conf"}" # Add the PySpark classes to the PYTHONPATH: export PYTHONPATH="$SPARK_HOME/python:$PYTHONPATH" export PYTHONPATH="$SPARK_HOME/python/lib/py4j-0.8.2.1-src.zip:$PYTHONPATH" |