diff options
| author | Aaron Davidson <aaron@databricks.com> | 2014-03-24 22:24:21 -0700 |
|---|---|---|
| committer | Aaron Davidson <aaron@databricks.com> | 2014-03-24 22:24:21 -0700 |
| commit | 007a733434aa39cdb137ab9795434ae2af70fe0b (patch) | |
| tree | 431f3cfd674c8e825c51bd6a0ecda8d3cc19ab1f /bin/spark-shell | |
| parent | b637f2d91ab4d3d5bf13e8d959c919ebd776f6af (diff) | |
| download | spark-007a733434aa39cdb137ab9795434ae2af70fe0b.tar.gz spark-007a733434aa39cdb137ab9795434ae2af70fe0b.tar.bz2 spark-007a733434aa39cdb137ab9795434ae2af70fe0b.zip | |
SPARK-1286: Make usage of spark-env.sh idempotent
Various spark scripts load spark-env.sh. This can cause growth of any variables that may be appended to (SPARK_CLASSPATH, SPARK_REPL_OPTS) and it makes the precedence order for options specified in spark-env.sh less clear.
One use-case for the latter is that we want to set options from the command-line of spark-shell, but these options will be overridden by subsequent loading of spark-env.sh. If we were to load the spark-env.sh first and then set our command-line options, we could guarantee correct precedence order.
Note that we use SPARK_CONF_DIR if available to support the sbin/ scripts, which always set this variable from sbin/spark-config.sh. Otherwise, we default to the ../conf/ as usual.
Author: Aaron Davidson <aaron@databricks.com>
Closes #184 from aarondav/idem and squashes the following commits:
e291f91 [Aaron Davidson] Use "private" variables in load-spark-env.sh
8da8360 [Aaron Davidson] Add .sh extension to load-spark-env.sh
93a2471 [Aaron Davidson] SPARK-1286: Make usage of spark-env.sh idempotent
Diffstat (limited to 'bin/spark-shell')
| -rwxr-xr-x | bin/spark-shell | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/bin/spark-shell b/bin/spark-shell index 7d3fe3aca7..861ab60654 100755 --- a/bin/spark-shell +++ b/bin/spark-shell @@ -81,9 +81,7 @@ done # Set MASTER from spark-env if possible DEFAULT_SPARK_MASTER_PORT=7077 if [ -z "$MASTER" ]; then - if [ -e "$FWDIR/conf/spark-env.sh" ]; then - . "$FWDIR/conf/spark-env.sh" - fi + . $FWDIR/bin/load-spark-env.sh if [ "x" != "x$SPARK_MASTER_IP" ]; then if [ "y" != "y$SPARK_MASTER_PORT" ]; then SPARK_MASTER_PORT="${SPARK_MASTER_PORT}" |