diff options
author | WangTaoTheTonic <wangtao111@huawei.com> | 2015-03-28 12:32:35 +0000 |
---|---|---|
committer | Sean Owen <sowen@cloudera.com> | 2015-03-28 12:32:35 +0000 |
commit | 99631438c0ec777d6a77974b148dbbd3e890260e (patch) | |
tree | ae582f7bbbb9ee2e18b1bae596f93e4906cafdbd | |
parent | 5909f0973de15f685836c2828e6d4c38f57d2c19 (diff) | |
download | spark-99631438c0ec777d6a77974b148dbbd3e890260e.tar.gz spark-99631438c0ec777d6a77974b148dbbd3e890260e.tar.bz2 spark-99631438c0ec777d6a77974b148dbbd3e890260e.zip |
[SPARK-6552][Deploy][Doc]expose start-slave.sh to user and update outdated doc
https://issues.apache.org/jira/browse/SPARK-6552
/cc srowen
Author: WangTaoTheTonic <wangtao111@huawei.com>
Closes #5205 from WangTaoTheTonic/SPARK-6552 and squashes the following commits:
b02263c [WangTaoTheTonic] use less than rather than less equal
f0fa408 [WangTaoTheTonic] expose start-slave.sh
-rw-r--r-- | docs/spark-standalone.md | 3 | ||||
-rwxr-xr-x | sbin/start-slave.sh | 10 | ||||
-rwxr-xr-x | sbin/start-slaves.sh | 2 |
3 files changed, 12 insertions, 3 deletions
diff --git a/docs/spark-standalone.md b/docs/spark-standalone.md index 74d8653a8b..0eed9adacf 100644 --- a/docs/spark-standalone.md +++ b/docs/spark-standalone.md @@ -24,7 +24,7 @@ the master's web UI, which is [http://localhost:8080](http://localhost:8080) by Similarly, you can start one or more workers and connect them to the master via: - ./bin/spark-class org.apache.spark.deploy.worker.Worker spark://IP:PORT + ./sbin/start-slave.sh <worker#> <master-spark-URL> Once you have started a worker, look at the master's web UI ([http://localhost:8080](http://localhost:8080) by default). You should see the new node listed there, along with its number of CPUs and memory (minus one gigabyte left for the OS). @@ -81,6 +81,7 @@ Once you've set up this file, you can launch or stop your cluster with the follo - `sbin/start-master.sh` - Starts a master instance on the machine the script is executed on. - `sbin/start-slaves.sh` - Starts a slave instance on each machine specified in the `conf/slaves` file. +- `sbin/start-slave.sh` - Starts a slave instance on the machine the script is executed on. - `sbin/start-all.sh` - Starts both a master and a number of slaves as described above. - `sbin/stop-master.sh` - Stops the master that was started via the `bin/start-master.sh` script. - `sbin/stop-slaves.sh` - Stops all slave instances on the machines specified in the `conf/slaves` file. diff --git a/sbin/start-slave.sh b/sbin/start-slave.sh index 2fc35309f4..c0155384f7 100755 --- a/sbin/start-slave.sh +++ b/sbin/start-slave.sh @@ -17,8 +17,14 @@ # limitations under the License. # -# Usage: start-slave.sh <worker#> <master-spark-URL> -# where <master-spark-URL> is like "spark://localhost:7077" +# Starts a slave on the machine this script is executed on. + +usage="Usage: start-slave.sh <worker#> <spark-master-URL> where <spark-master-URL> is like "spark://localhost:7077" + +if [ $# -lt 2 ]; then + echo $usage + exit 1 +fi sbin="`dirname "$0"`" sbin="`cd "$sbin"; pwd`" diff --git a/sbin/start-slaves.sh b/sbin/start-slaves.sh index 76316a3067..4356c03657 100755 --- a/sbin/start-slaves.sh +++ b/sbin/start-slaves.sh @@ -17,6 +17,8 @@ # limitations under the License. # +# Starts a slave instance on each machine specified in the conf/slaves file. + sbin="`dirname "$0"`" sbin="`cd "$sbin"; pwd`" |