diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2013-12-06 17:41:27 -0800 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2013-12-06 17:42:28 -0800 |
| commit | bb6e25c663a0fa96552994bcdda2049e9b621db7 (patch) | |
| tree | 21df6d76990b6a50214261e7adea471331f7d7dd | |
| parent | 241336add5be07fca5ff6c17eed368df7d0c3e3c (diff) | |
| download | spark-bb6e25c663a0fa96552994bcdda2049e9b621db7.tar.gz spark-bb6e25c663a0fa96552994bcdda2049e9b621db7.tar.bz2 spark-bb6e25c663a0fa96552994bcdda2049e9b621db7.zip | |
Minor doc fixes and updating README
| -rw-r--r-- | README.md | 7 | ||||
| -rw-r--r-- | docs/building-with-maven.md | 4 | ||||
| -rw-r--r-- | docs/index.md | 2 |
3 files changed, 10 insertions, 3 deletions
@@ -55,7 +55,7 @@ versions without YARN, use: # Cloudera CDH 4.2.0 with MapReduce v1 $ SPARK_HADOOP_VERSION=2.0.0-mr1-cdh4.2.0 sbt/sbt assembly -For Apache Hadoop 2.x, 0.23.x, Cloudera CDH MRv2, and other Hadoop versions +For Apache Hadoop 2.0.X, 2.1.X, 0.23.x, Cloudera CDH MRv2, and other Hadoop versions with YARN, also set `SPARK_YARN=true`: # Apache Hadoop 2.0.5-alpha @@ -64,6 +64,11 @@ with YARN, also set `SPARK_YARN=true`: # Cloudera CDH 4.2.0 with MapReduce v2 $ SPARK_HADOOP_VERSION=2.0.0-cdh4.2.0 SPARK_YARN=true sbt/sbt assembly +When building for Hadoop 2.2.X and newer, you'll need to include the additional `new-yarn` profile: + + # Apache Hadoop 2.2.X and newer + $ mvn -Dyarn.version=2.2.0 -Dhadoop.version=2.2.0 -Pnew-yarn + For convenience, these variables may also be set through the `conf/spark-env.sh` file described below. diff --git a/docs/building-with-maven.md b/docs/building-with-maven.md index a50878630d..c709001632 100644 --- a/docs/building-with-maven.md +++ b/docs/building-with-maven.md @@ -46,7 +46,9 @@ For Apache Hadoop 2.x, 0.23.x, Cloudera CDH MRv2, and other Hadoop versions with $ mvn -Phadoop2-yarn -Dhadoop.version=2.0.0-cdh4.2.0 -Dyarn.version=2.0.0-chd4.2.0 -DskipTests clean package Hadoop versions 2.2.x and newer can be built by setting the ```new-yarn``` and the ```yarn.version``` as follows: - mvn -Dyarn.version=2.2.0 -Dhadoop.version=2.2.0 -Pnew-yarn + + # Apache Hadoop 2.2.X and newer + $ mvn -Dyarn.version=2.2.0 -Dhadoop.version=2.2.0 -Pnew-yarn The build process handles Hadoop 2.2.x as a special case that uses the directory ```new-yarn```, which supports the new YARN API. Furthermore, for this version, the build depends on artifacts published by the spark-project to enable Akka 2.0.5 to work with protobuf 2.5. diff --git a/docs/index.md b/docs/index.md index bbb27338bc..45616f78f9 100644 --- a/docs/index.md +++ b/docs/index.md @@ -65,7 +65,7 @@ In addition, if you wish to run Spark on [YARN](running-on-yarn.md), set Note that on Windows, you need to set the environment variables on separate lines, e.g., `set SPARK_HADOOP_VERSION=1.2.1`. -For this version of Spark (0.8.1) Hadoop 2.2.x (or newer) users will have to build Spark and publish it locally. See [Launching Spark on YARN](running-on-yarn.md). This is needed because Hadoop 2.2 has non backwards compatible API changes. +For this version of Spark (0.8.1) Hadoop 2.2.x (or newer) users will have to build Spark and publish it locally. See [Launching Spark on YARN](running-on-yarn.html). This is needed because Hadoop 2.2 has non backwards compatible API changes. # Where to Go from Here |