diff options
| author | Aaron Davidson <aaron@databricks.com> | 2014-04-04 09:50:24 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-04-04 09:50:24 -0700 |
| commit | 01cf4c402b9fda59680e56112bfaa2b748416d0e (patch) | |
| tree | c92153441be83bdf0c1a57fff8e6d584b1a89796 /bin/load-spark-env.sh | |
| parent | 7f32fd42aaadcf6626b4d8bcf6295203b43b2037 (diff) | |
| download | spark-01cf4c402b9fda59680e56112bfaa2b748416d0e.tar.gz spark-01cf4c402b9fda59680e56112bfaa2b748416d0e.tar.bz2 spark-01cf4c402b9fda59680e56112bfaa2b748416d0e.zip | |
SPARK-1404: Always upgrade spark-env.sh vars to environment vars
This was broken when spark-env.sh was made idempotent, as the idempotence check is an environment variable, but the spark-env.sh variables may not have been.
Tested in zsh, bash, and sh.
Author: Aaron Davidson <aaron@databricks.com>
Closes #310 from aarondav/SPARK-1404 and squashes the following commits:
c3406a5 [Aaron Davidson] Add extra export in spark-shell
6a0e340 [Aaron Davidson] SPARK-1404: Always upgrade spark-env.sh vars to environment vars
Diffstat (limited to 'bin/load-spark-env.sh')
| -rw-r--r-- | bin/load-spark-env.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/bin/load-spark-env.sh b/bin/load-spark-env.sh index 476dd82655..d425f9feaa 100644 --- a/bin/load-spark-env.sh +++ b/bin/load-spark-env.sh @@ -30,6 +30,9 @@ if [ -z "$SPARK_ENV_LOADED" ]; then use_conf_dir=${SPARK_CONF_DIR:-"$parent_dir/conf"} if [ -f "${use_conf_dir}/spark-env.sh" ]; then + # Promote all variable declarations to environment (exported) variables + set -a . "${use_conf_dir}/spark-env.sh" + set +a fi fi |