Repository: spark Updated Branches: refs/heads/branch-1.3 da56e64d6 -> 4d770583c
[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 <[email protected]> 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 <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/4d770583 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/4d770583 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/4d770583 Branch: refs/heads/branch-1.3 Commit: 4d770583ccc88e59caabbec7253b8c6c89e86ef1 Parents: da56e64 Author: Sean Owen <[email protected]> Authored: Fri May 15 11:30:19 2015 -0700 Committer: Andrew Or <[email protected]> Committed: Fri May 15 11:31:01 2015 -0700 ---------------------------------------------------------------------- sbin/start-master.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/4d770583/sbin/start-master.sh ---------------------------------------------------------------------- diff --git a/sbin/start-master.sh b/sbin/start-master.sh index 17fff58..a7f5d57 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 --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
