diff options
| author | WangTaoTheTonic <barneystinson@aliyun.com> | 2014-10-03 10:42:41 -0700 |
|---|---|---|
| committer | Andrew Or <andrewor14@gmail.com> | 2014-10-03 10:47:47 -0700 |
| commit | d5af9e160e6e1927aa79605df3704ddd7a3f82ad (patch) | |
| tree | cf4986eba9f055cee8b56ff4006bed0b5ce521b0 | |
| parent | 5d991db8a84a62705efa41c9c8a215569ad648fe (diff) | |
| download | spark-d5af9e160e6e1927aa79605df3704ddd7a3f82ad.tar.gz spark-d5af9e160e6e1927aa79605df3704ddd7a3f82ad.tar.bz2 spark-d5af9e160e6e1927aa79605df3704ddd7a3f82ad.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
(cherry picked from commit 9d320e222c221e5bb827cddf01a83e64a16d74ff)
Signed-off-by: Andrew Or <andrewor14@gmail.com>
Conflicts:
sbin/spark-config.sh
| -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 5c87da5815..396c729511 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 |