diff options
| author | CrazyJvm <crazyjvm@gmail.com> | 2014-01-16 11:45:02 +0800 |
|---|---|---|
| committer | CrazyJvm <crazyjvm@gmail.com> | 2014-01-16 11:45:02 +0800 |
| commit | 7a0c5b5a2362253e70f9c7d72dab1cad380e52c7 (patch) | |
| tree | 33b6b16b71d9a232b9eb5c629e711c0d6fbd0f3c /bin | |
| parent | 263933da97d5e877999ce282f3e52457ae2d9377 (diff) | |
| download | spark-7a0c5b5a2362253e70f9c7d72dab1cad380e52c7.tar.gz spark-7a0c5b5a2362253e70f9c7d72dab1cad380e52c7.tar.bz2 spark-7a0c5b5a2362253e70f9c7d72dab1cad380e52c7.zip | |
fix "set MASTER automatically fails" bug.
spark-shell intends to set MASTER automatically if we do not provide the option when we start the shell , but there's a problem.
The condition is "if [[ "x" != "x$SPARK_MASTER_IP" && "y" != "y$SPARK_MASTER_PORT" ]];" we sure will set SPARK_MASTER_IP explicitly, the SPARK_MASTER_PORT option, however, we probably do not set just using spark default port 7077. So if we do not set SPARK_MASTER_PORT, the condition will never be true. We should just use default port if users do not set port explicitly I think.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/spark-shell | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/bin/spark-shell b/bin/spark-shell index e6885b51ef..398f2118e0 100755 --- a/bin/spark-shell +++ b/bin/spark-shell @@ -45,13 +45,18 @@ for o in "$@"; do 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 - if [[ "x" != "x$SPARK_MASTER_IP" && "y" != "y$SPARK_MASTER_PORT" ]]; then - MASTER="spark://${SPARK_MASTER_IP}:${SPARK_MASTER_PORT}" - export MASTER + if [ "x" != "x$SPARK_MASTER_IP" ];then + if [ "y" != "y$SPARK_MASTER_PORT" ];then + SPARK_MASTER_PORT="${SPARK_MASTER_PORT}" + else + SPARK_MASTER_PORT=$DEFAULT_SPARK_MASTER_PORT + fi + export MASTER="spark://${SPARK_MASTER_IP}:${SPARK_MASTER_PORT}" fi fi |