diff options
author | Patrick Wendell <pwendell@gmail.com> | 2014-01-03 21:29:33 -0800 |
---|---|---|
committer | Patrick Wendell <pwendell@gmail.com> | 2014-01-03 21:29:33 -0800 |
commit | 604fad9c39763012d97b404941f7ba7137ec2eed (patch) | |
tree | a327c39fcf9ac53e17fbeb5dfedb11e04f505f3c /sbin/start-slave.sh | |
parent | 9e6f3bdcda1ab48159afa4f54b64d05e42a8688e (diff) | |
parent | c4d6145f7fde8a516024e886314bf8fecde817ea (diff) | |
download | spark-604fad9c39763012d97b404941f7ba7137ec2eed.tar.gz spark-604fad9c39763012d97b404941f7ba7137ec2eed.tar.bz2 spark-604fad9c39763012d97b404941f7ba7137ec2eed.zip |
Merge remote-tracking branch 'apache-github/master' into remove-binaries
Conflicts:
core/src/test/scala/org/apache/spark/DriverSuite.scala
docs/python-programming-guide.md
Diffstat (limited to 'sbin/start-slave.sh')
-rwxr-xr-x | sbin/start-slave.sh | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/sbin/start-slave.sh b/sbin/start-slave.sh new file mode 100755 index 0000000000..524be38c62 --- /dev/null +++ b/sbin/start-slave.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env bash + +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# Usage: start-slave.sh <worker#> <master-spark-URL> +# where <master-spark-URL> is like "spark://localhost:7077" + +sbin=`dirname "$0"` +sbin=`cd "$sbin"; 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: + # 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 + +"$sbin"/spark-daemon.sh start org.apache.spark.deploy.worker.Worker "$@" |