diff options
| author | Josh Rosen <joshrosen@eecs.berkeley.edu> | 2012-12-01 18:18:15 -0800 |
|---|---|---|
| committer | Josh Rosen <joshrosen@eecs.berkeley.edu> | 2012-12-01 18:19:13 -0800 |
| commit | cdaa0fad51c7ad6c2a56f6c14faedd08fe341b2e (patch) | |
| tree | e2cdaf661df2e1b67c377696de1aa7c0d6359be6 /bin | |
| parent | 8d3713c22180e9a7f190549c2b94ac058c07130a (diff) | |
| download | spark-cdaa0fad51c7ad6c2a56f6c14faedd08fe341b2e.tar.gz spark-cdaa0fad51c7ad6c2a56f6c14faedd08fe341b2e.tar.bz2 spark-cdaa0fad51c7ad6c2a56f6c14faedd08fe341b2e.zip | |
Use external addresses in standalone WebUI on EC2.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/start-master.sh | 11 | ||||
| -rwxr-xr-x | bin/start-slave.sh | 15 | ||||
| -rwxr-xr-x | bin/start-slaves.sh | 5 |
3 files changed, 28 insertions, 3 deletions
diff --git a/bin/start-master.sh b/bin/start-master.sh index 6403c944a4..ad19d48331 100755 --- a/bin/start-master.sh +++ b/bin/start-master.sh @@ -7,4 +7,13 @@ bin=`cd "$bin"; pwd` . "$bin/spark-config.sh" -"$bin"/spark-daemon.sh start spark.deploy.master.Master
\ No newline at end of file +# Set SPARK_PUBLIC_DNS so the master report the correct webUI address to the slaves +if [ "$SPARK_PUBLIC_DNS" = "" ]; then + # If we appear to be running on EC2, use the public address by default: + if [[ `hostname` == *ec2.internal ]]; then + echo "RUNNING ON EC2" + export SPARK_PUBLIC_DNS=`wget -q -O - http://instance-data.ec2.internal/latest/meta-data/public-hostname` + fi +fi + +"$bin"/spark-daemon.sh start spark.deploy.master.Master diff --git a/bin/start-slave.sh b/bin/start-slave.sh new file mode 100755 index 0000000000..10cce9c17b --- /dev/null +++ b/bin/start-slave.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +bin=`dirname "$0"` +bin=`cd "$bin"; pwd` + +# Set SPARK_PUBLIC_DNS so slaves can be linked in master web UI +if [ "$SPARK_PUBLIC_DNS" = "" ]; then + # If we appear to be running on EC2, use the public address by default: + if [[ `hostname` == *ec2.internal ]]; then + echo "RUNNING ON EC2" + export SPARK_PUBLIC_DNS=`wget -q -O - http://instance-data.ec2.internal/latest/meta-data/public-hostname` + fi +fi + +"$bin"/spark-daemon.sh start spark.deploy.worker.Worker $1 diff --git a/bin/start-slaves.sh b/bin/start-slaves.sh index 67b07215a2..390247ca4a 100755 --- a/bin/start-slaves.sh +++ b/bin/start-slaves.sh @@ -18,6 +18,7 @@ if [ "$SPARK_MASTER_IP" = "" ]; then SPARK_MASTER_IP=`hostname` fi -echo "Master IP: $ip" +echo "Master IP: $SPARK_MASTER_IP" -"$bin"/spark-daemons.sh start spark.deploy.worker.Worker spark://$SPARK_MASTER_IP:$SPARK_MASTER_PORT +# Launch the slaves +exec "$bin/slaves.sh" cd "$SPARK_HOME" \; "$bin/start-slave.sh" spark://$SPARK_MASTER_IP:$SPARK_MASTER_PORT |