aboutsummaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorbomeng <bmeng@us.ibm.com>2016-06-12 14:25:48 +0100
committerSean Owen <sowen@cloudera.com>2016-06-12 14:25:48 +0100
commit50248dcfff3ba79b73323f3a804c1e19a8be6097 (patch)
treeb1ad5729b2fe3cefb3142b17f2fff312d7e7a836 /sbin
parent3fd3ee038b89821f51f30a4ecd4452b5b3bc6568 (diff)
downloadspark-50248dcfff3ba79b73323f3a804c1e19a8be6097.tar.gz
spark-50248dcfff3ba79b73323f3a804c1e19a8be6097.tar.bz2
spark-50248dcfff3ba79b73323f3a804c1e19a8be6097.zip
[SPARK-15806][DOCUMENTATION] update doc for SPARK_MASTER_IP
## What changes were proposed in this pull request? SPARK_MASTER_IP is a deprecated environment variable. It is replaced by SPARK_MASTER_HOST according to MasterArguments.scala. ## How was this patch tested? Manually verified. Author: bomeng <bmeng@us.ibm.com> Closes #13543 from bomeng/SPARK-15806.
Diffstat (limited to 'sbin')
-rwxr-xr-xsbin/start-master.sh6
-rwxr-xr-xsbin/start-slaves.sh6
2 files changed, 6 insertions, 6 deletions
diff --git a/sbin/start-master.sh b/sbin/start-master.sh
index ce7f177959..981cb15bc0 100755
--- a/sbin/start-master.sh
+++ b/sbin/start-master.sh
@@ -47,8 +47,8 @@ if [ "$SPARK_MASTER_PORT" = "" ]; then
SPARK_MASTER_PORT=7077
fi
-if [ "$SPARK_MASTER_IP" = "" ]; then
- SPARK_MASTER_IP=`hostname`
+if [ "$SPARK_MASTER_HOST" = "" ]; then
+ SPARK_MASTER_HOST=`hostname`
fi
if [ "$SPARK_MASTER_WEBUI_PORT" = "" ]; then
@@ -56,5 +56,5 @@ if [ "$SPARK_MASTER_WEBUI_PORT" = "" ]; then
fi
"${SPARK_HOME}/sbin"/spark-daemon.sh start $CLASS 1 \
- --ip $SPARK_MASTER_IP --port $SPARK_MASTER_PORT --webui-port $SPARK_MASTER_WEBUI_PORT \
+ --host $SPARK_MASTER_HOST --port $SPARK_MASTER_PORT --webui-port $SPARK_MASTER_WEBUI_PORT \
$ORIGINAL_ARGS
diff --git a/sbin/start-slaves.sh b/sbin/start-slaves.sh
index 5bf2b83b42..0fa1605489 100755
--- a/sbin/start-slaves.sh
+++ b/sbin/start-slaves.sh
@@ -31,9 +31,9 @@ if [ "$SPARK_MASTER_PORT" = "" ]; then
SPARK_MASTER_PORT=7077
fi
-if [ "$SPARK_MASTER_IP" = "" ]; then
- SPARK_MASTER_IP="`hostname`"
+if [ "$SPARK_MASTER_HOST" = "" ]; then
+ SPARK_MASTER_HOST="`hostname`"
fi
# Launch the slaves
-"${SPARK_HOME}/sbin/slaves.sh" cd "${SPARK_HOME}" \; "${SPARK_HOME}/sbin/start-slave.sh" "spark://$SPARK_MASTER_IP:$SPARK_MASTER_PORT"
+"${SPARK_HOME}/sbin/slaves.sh" cd "${SPARK_HOME}" \; "${SPARK_HOME}/sbin/start-slave.sh" "spark://$SPARK_MASTER_HOST:$SPARK_MASTER_PORT"