diff options
author | Evan Chan <ev@ooyala.com> | 2013-06-28 13:46:21 -0700 |
---|---|---|
committer | Evan Chan <ev@ooyala.com> | 2013-06-28 13:46:21 -0700 |
commit | 8113c55df8f4b5f34140ddba5e58e132e3dc2d23 (patch) | |
tree | 6a18d02fa620b34bc1a53d0fdc57e50a6f25e8ce /spark-shell | |
parent | 8dd78f80b578751df164772a01772aad26540ac9 (diff) | |
download | spark-8113c55df8f4b5f34140ddba5e58e132e3dc2d23.tar.gz spark-8113c55df8f4b5f34140ddba5e58e132e3dc2d23.tar.bz2 spark-8113c55df8f4b5f34140ddba5e58e132e3dc2d23.zip |
[Feedback] Get rid of -m, set MASTER from SPARK_MASTER_IP/PORT automagically
Diffstat (limited to 'spark-shell')
-rwxr-xr-x | spark-shell | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/spark-shell b/spark-shell index ea67a3e6b8..a8e72143fb 100755 --- a/spark-shell +++ b/spark-shell @@ -1,24 +1,14 @@ #!/bin/bash --posix # # Shell script for starting the Spark Shell REPL +# Note that it will set MASTER to spark://${SPARK_MASTER_IP}:${SPARK_MASTER_PORT} +# if those two env vars are set in spark-env.sh but MASTER is not. # Options: -# -m Set MASTER to spark://$SPARK_MASTER_IP:$SPARK_MASTER_PORT # -c <cores> Set the number of cores for REPL to use # FWDIR="`dirname $0`" for o in "$@"; do - if [ "$1" = "-m" -o "$1" = "--master" ]; then - shift - if [ -e "$FWDIR/conf/spark-env.sh" ]; then - . "$FWDIR/conf/spark-env.sh" - fi - if [ -z "$MASTER" ]; then - MASTER="spark://${SPARK_MASTER_IP}:${SPARK_MASTER_PORT}" - fi - export MASTER - fi - if [ "$1" = "-c" -o "$1" = "--cores" ]; then shift if [ -n "$1" ]; then @@ -28,6 +18,17 @@ for o in "$@"; do fi done +# Set MASTER from spark-env if possible +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 + fi +fi + # Copy restore-TTY-on-exit functions from Scala script so spark-shell exits properly even in # binary distribution of Spark where Scala is not installed exit_status=127 |