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/spark-shell | |
| 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/spark-shell')
| -rwxr-xr-x | bin/spark-shell | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/spark-shell b/bin/spark-shell index fac006cf49..535ee3ccd8 100755 --- a/bin/spark-shell +++ b/bin/spark-shell @@ -127,7 +127,7 @@ function set_spark_log_conf(){ function set_spark_master(){ if ! [[ "$1" =~ $ARG_FLAG_PATTERN ]]; then - MASTER="$1" + export MASTER="$1" else out_error "wrong format for $2" fi @@ -145,7 +145,7 @@ function resolve_spark_master(){ fi if [ -z "$MASTER" ]; then - MASTER="$DEFAULT_MASTER" + export MASTER="$DEFAULT_MASTER" fi } |