diff options
author | Sean Owen <sowen@cloudera.com> | 2015-05-15 11:30:19 -0700 |
---|---|---|
committer | Andrew Or <andrew@databricks.com> | 2015-05-15 11:30:26 -0700 |
commit | fe3c7340f0b7bb858ad7ed5b8df263ba5b9217e1 (patch) | |
tree | 38f891959421ca361c402c64a33a2e3b631cc621 /sbin | |
parent | 866e4b52047f5d9da9de2fd81864a0706af9b99f (diff) | |
download | spark-fe3c7340f0b7bb858ad7ed5b8df263ba5b9217e1.tar.gz spark-fe3c7340f0b7bb858ad7ed5b8df263ba5b9217e1.tar.bz2 spark-fe3c7340f0b7bb858ad7ed5b8df263ba5b9217e1.zip |
[SPARK-5412] [DEPLOY] Cannot bind Master to a specific hostname as per the documentation
Pass args to start-master.sh through to start-daemon.sh, as other scripts do, so that things like --host have effect on start-master.sh as per docs
Author: Sean Owen <sowen@cloudera.com>
Closes #6185 from srowen/SPARK-5412 and squashes the following commits:
b3ce9da [Sean Owen] Pass args to start-master.sh through to start-daemon.sh, as other scripts do, so that things like --host have effect on start-master.sh as per docs
(cherry picked from commit 8ab1450d3995b0c3ef64c5991b88c258e17bcb12)
Signed-off-by: Andrew Or <andrew@databricks.com>
Diffstat (limited to 'sbin')
-rwxr-xr-x | sbin/start-master.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sbin/start-master.sh b/sbin/start-master.sh index 17fff58f4f..a7f5d5702f 100755 --- a/sbin/start-master.sh +++ b/sbin/start-master.sh @@ -22,6 +22,8 @@ sbin="`dirname "$0"`" sbin="`cd "$sbin"; pwd`" +ORIGINAL_ARGS="$@" + START_TACHYON=false while (( "$#" )); do @@ -53,7 +55,9 @@ if [ "$SPARK_MASTER_WEBUI_PORT" = "" ]; then SPARK_MASTER_WEBUI_PORT=8080 fi -"$sbin"/spark-daemon.sh start org.apache.spark.deploy.master.Master 1 --ip $SPARK_MASTER_IP --port $SPARK_MASTER_PORT --webui-port $SPARK_MASTER_WEBUI_PORT +"$sbin"/spark-daemon.sh start org.apache.spark.deploy.master.Master 1 \ + --ip $SPARK_MASTER_IP --port $SPARK_MASTER_PORT --webui-port $SPARK_MASTER_WEBUI_PORT \ + $ORIGINAL_ARGS if [ "$START_TACHYON" == "true" ]; then "$sbin"/../tachyon/bin/tachyon bootstrap-conf $SPARK_MASTER_IP |