[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 8ab1450d39)
Signed-off-by: Andrew Or <andrew@databricks.com>
This commit is contained in:
Sean Owen 2015-05-15 11:30:19 -07:00 committed by Andrew Or
parent 866e4b5204
commit fe3c7340f0

View file

@ -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