diff options
| author | Josh Rosen <joshrosen@eecs.berkeley.edu> | 2013-05-24 13:05:06 -0700 |
|---|---|---|
| committer | Josh Rosen <joshrosen@eecs.berkeley.edu> | 2013-05-24 13:05:06 -0700 |
| commit | cda2b150412314c47c2c24883111bfc441c3a3a2 (patch) | |
| tree | 8129d71e06f86204ad1e948ee0de790e0f2eac97 /bin/start-slave.sh | |
| parent | a2b0a7975c19bfd6ad24f03d36e140b508401adb (diff) | |
| download | spark-cda2b150412314c47c2c24883111bfc441c3a3a2.tar.gz spark-cda2b150412314c47c2c24883111bfc441c3a3a2.tar.bz2 spark-cda2b150412314c47c2c24883111bfc441c3a3a2.zip | |
Use ec2-metadata in start-slave.sh.
PR #419 applied the same change, but only to start-master.sh,
so some workers were still starting their web UI's using internal
addresses.
This should finally fix SPARK-613.
Diffstat (limited to 'bin/start-slave.sh')
| -rwxr-xr-x | bin/start-slave.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/start-slave.sh b/bin/start-slave.sh index 616c76e4ee..26b5b9d462 100755 --- a/bin/start-slave.sh +++ b/bin/start-slave.sh @@ -6,7 +6,8 @@ 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 + # NOTE: ec2-metadata is installed on Amazon Linux AMI. Check based on that and hostname + if command -v ec2-metadata > /dev/null || [[ `hostname` == *ec2.internal ]]; then export SPARK_PUBLIC_DNS=`wget -q -O - http://instance-data.ec2.internal/latest/meta-data/public-hostname` fi fi |