diff options
author | Raymond Liu <raymond.liu@intel.com> | 2014-01-02 11:23:33 +0800 |
---|---|---|
committer | Raymond Liu <raymond.liu@intel.com> | 2014-01-03 12:14:38 +0800 |
commit | ebdfa6bb9766209bc5a3c4241fa47141c5e9c5cb (patch) | |
tree | b0934f5257d7ace8409de75cb767de8f75bbd598 | |
parent | a47ebf7228acb22f23293cc7197a14b88c1ea65a (diff) | |
download | spark-ebdfa6bb9766209bc5a3c4241fa47141c5e9c5cb.tar.gz spark-ebdfa6bb9766209bc5a3c4241fa47141c5e9c5cb.tar.bz2 spark-ebdfa6bb9766209bc5a3c4241fa47141c5e9c5cb.zip |
Using name yarn-alpha/yarn instead of yarn-2.0/yarn-2.2
-rw-r--r-- | assembly/pom.xml | 8 | ||||
-rw-r--r-- | docs/building-with-maven.md | 8 | ||||
-rw-r--r-- | pom.xml | 4 | ||||
-rw-r--r-- | project/SparkBuild.scala | 16 | ||||
-rw-r--r-- | yarn/README.md | 8 | ||||
-rw-r--r-- | yarn/alpha/pom.xml (renamed from yarn/2.2/pom.xml) | 4 | ||||
-rw-r--r-- | yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala (renamed from yarn/2.0/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala) | 0 | ||||
-rw-r--r-- | yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/Client.scala (renamed from yarn/2.0/src/main/scala/org/apache/spark/deploy/yarn/Client.scala) | 0 | ||||
-rw-r--r-- | yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/WorkerLauncher.scala (renamed from yarn/2.0/src/main/scala/org/apache/spark/deploy/yarn/WorkerLauncher.scala) | 0 | ||||
-rw-r--r-- | yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/WorkerRunnable.scala (renamed from yarn/2.0/src/main/scala/org/apache/spark/deploy/yarn/WorkerRunnable.scala) | 0 | ||||
-rw-r--r-- | yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala (renamed from yarn/2.0/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala) | 0 | ||||
-rw-r--r-- | yarn/pom.xml | 8 | ||||
-rw-r--r-- | yarn/stable/pom.xml (renamed from yarn/2.0/pom.xml) | 4 | ||||
-rw-r--r-- | yarn/stable/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala (renamed from yarn/2.2/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala) | 0 | ||||
-rw-r--r-- | yarn/stable/src/main/scala/org/apache/spark/deploy/yarn/Client.scala (renamed from yarn/2.2/src/main/scala/org/apache/spark/deploy/yarn/Client.scala) | 0 | ||||
-rw-r--r-- | yarn/stable/src/main/scala/org/apache/spark/deploy/yarn/WorkerLauncher.scala (renamed from yarn/2.2/src/main/scala/org/apache/spark/deploy/yarn/WorkerLauncher.scala) | 0 | ||||
-rw-r--r-- | yarn/stable/src/main/scala/org/apache/spark/deploy/yarn/WorkerRunnable.scala (renamed from yarn/2.2/src/main/scala/org/apache/spark/deploy/yarn/WorkerRunnable.scala) | 0 | ||||
-rw-r--r-- | yarn/stable/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala (renamed from yarn/2.2/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala) | 0 |
18 files changed, 30 insertions, 30 deletions
diff --git a/assembly/pom.xml b/assembly/pom.xml index bd94834415..079509bec6 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -124,21 +124,21 @@ <profiles> <profile> - <id>hadoop2-yarn</id> + <id>yarn-alpha</id> <dependencies> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-yarn-2.0_${scala.binary.version}</artifactId> + <artifactId>spark-yarn-alpha_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> </dependencies> </profile> <profile> - <id>hadoop2.2-yarn</id> + <id>yarn</id> <dependencies> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-yarn-2.2_${scala.binary.version}</artifactId> + <artifactId>spark-yarn_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> </dependencies> diff --git a/docs/building-with-maven.md b/docs/building-with-maven.md index 699b10b188..b9ff0af76f 100644 --- a/docs/building-with-maven.md +++ b/docs/building-with-maven.md @@ -37,16 +37,16 @@ For Apache Hadoop versions 1.x, Cloudera CDH MRv1, and other Hadoop versions wit # Cloudera CDH 4.2.0 with MapReduce v1 $ mvn -Dhadoop.version=2.0.0-mr1-cdh4.2.0 -DskipTests clean package -For Apache Hadoop 2.x, 0.23.x, Cloudera CDH MRv2, and other Hadoop versions with YARN, you should enable the "hadoop2-yarn" or "hadoop2.2-yarn" profile and set the "hadoop.version", "yarn.version" property: +For Apache Hadoop 2.x, 0.23.x, Cloudera CDH MRv2, and other Hadoop versions with YARN, you should enable the "yarn-alpha" or "yarn" profile and set the "hadoop.version", "yarn.version" property: # Apache Hadoop 2.0.5-alpha - $ mvn -Phadoop2-yarn -Dhadoop.version=2.0.5-alpha -Dyarn.version=2.0.5-alpha -DskipTests clean package + $ mvn -Pyarn-alpha -Dhadoop.version=2.0.5-alpha -Dyarn.version=2.0.5-alpha -DskipTests clean package # Cloudera CDH 4.2.0 with MapReduce v2 - $ mvn -Phadoop2-yarn -Dhadoop.version=2.0.0-cdh4.2.0 -Dyarn.version=2.0.0-chd4.2.0 -DskipTests clean package + $ mvn -Pyarn-alpha -Dhadoop.version=2.0.0-cdh4.2.0 -Dyarn.version=2.0.0-chd4.2.0 -DskipTests clean package # Apache Hadoop 2.2.X ( e.g. 2.2.0 as below ) and newer - $ mvn -Phadoop2.2-yarn -Dhadoop.version=2.2.0 -Dyarn.version=2.2.0 -DskipTests clean package + $ mvn -Pyarn -Dhadoop.version=2.2.0 -Dyarn.version=2.2.0 -DskipTests clean package ## Spark Tests in Maven ## @@ -722,7 +722,7 @@ <profiles> <profile> - <id>hadoop2-yarn</id> + <id>yarn-alpha</id> <properties> <hadoop.major.version>2</hadoop.major.version> <!-- 0.23.* is same as 2.0.* - except hardened to run production jobs --> @@ -738,7 +738,7 @@ </profile> <profile> - <id>hadoop2.2-yarn</id> + <id>yarn</id> <properties> <hadoop.major.version>2</hadoop.major.version> <hadoop.version>2.2.0</hadoop.version> diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index bc9c02d96f..b0749cc9c4 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -85,11 +85,11 @@ object SparkBuild extends Build { } // Conditionally include the yarn sub-project - lazy val yarn20 = Project("yarn2-alpha", file("yarn/2.0"), settings = yarn20Settings) dependsOn(core) - lazy val yarn22 = Project("yarn2-stable", file("yarn/2.2"), settings = yarn22Settings) dependsOn(core) + lazy val yarnAlpha = Project("yarn-alpha", file("yarn/alpha"), settings = yarnAlphaSettings) dependsOn(core) + lazy val yarn = Project("yarn", file("yarn/stable"), settings = yarnSettings) dependsOn(core) - lazy val maybeYarn = if (isYarnEnabled) Seq[ClasspathDependency](if (isNewHadoop) yarn22 else yarn20) else Seq[ClasspathDependency]() - lazy val maybeYarnRef = if (isYarnEnabled) Seq[ProjectReference](if (isNewHadoop) yarn22 else yarn20) else Seq[ProjectReference]() + lazy val maybeYarn = if (isYarnEnabled) Seq[ClasspathDependency](if (isNewHadoop) yarn else yarnAlpha) else Seq[ClasspathDependency]() + lazy val maybeYarnRef = if (isYarnEnabled) Seq[ProjectReference](if (isNewHadoop) yarn else yarnAlpha) else Seq[ProjectReference]() // Everything except assembly, tools and examples belong to packageProjects lazy val packageProjects = Seq[ProjectReference](core, repl, bagel, streaming, mllib) ++ maybeYarnRef @@ -334,12 +334,12 @@ object SparkBuild extends Build { ) ++ extraYarnSettings - def yarn20Settings = yarnCommonSettings ++ Seq( - name := "spark-yarn-2.0" + def yarnAlphaSettings = yarnCommonSettings ++ Seq( + name := "spark-yarn-alpha" ) - def yarn22Settings = yarnCommonSettings ++ Seq( - name := "spark-yarn-2.2" + def yarnSettings = yarnCommonSettings ++ Seq( + name := "spark-yarn" ) // Conditionally include the YARN dependencies because some tools look at all sub-projects and will complain diff --git a/yarn/README.md b/yarn/README.md index 0d63bd9352..9a7a1dd838 100644 --- a/yarn/README.md +++ b/yarn/README.md @@ -4,9 +4,9 @@ Hadoop Yarn related codes are organized in separate directories for easy managem * common : Common codes that do not depending on specific version of Hadoop. - * 2.0 / 2.2 : Codes that involve specific version of Hadoop YARN API. + * alpha / stable : Codes that involve specific version of Hadoop YARN API. - 2.0 actually represents 0.23 and 2.0 - 2.2 actually represents 2.2 and later, until the API is break again. + alpha represents 0.23 and 2.0.x + stable represents 2.2 and later, until the API is break again. -2.0 / 2.2 will build together with common dir into a single jar +alpha / stable will build together with common dir into a single jar diff --git a/yarn/2.2/pom.xml b/yarn/alpha/pom.xml index 345462a2c0..94812f8c45 100644 --- a/yarn/2.2/pom.xml +++ b/yarn/alpha/pom.xml @@ -25,9 +25,9 @@ </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-yarn-2.2_2.10</artifactId> + <artifactId>spark-yarn-alpha_2.10</artifactId> <packaging>jar</packaging> - <name>Spark Project YARN 2.2</name> + <name>Spark Project YARN Alpha API</name> <url>http://spark.incubator.apache.org/</url> <build> diff --git a/yarn/2.0/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala b/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala index 7cf120d3eb..7cf120d3eb 100644 --- a/yarn/2.0/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala +++ b/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala diff --git a/yarn/2.0/src/main/scala/org/apache/spark/deploy/yarn/Client.scala b/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/Client.scala index 2bd047c97a..2bd047c97a 100644 --- a/yarn/2.0/src/main/scala/org/apache/spark/deploy/yarn/Client.scala +++ b/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/Client.scala diff --git a/yarn/2.0/src/main/scala/org/apache/spark/deploy/yarn/WorkerLauncher.scala b/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/WorkerLauncher.scala index e64530702c..e64530702c 100644 --- a/yarn/2.0/src/main/scala/org/apache/spark/deploy/yarn/WorkerLauncher.scala +++ b/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/WorkerLauncher.scala diff --git a/yarn/2.0/src/main/scala/org/apache/spark/deploy/yarn/WorkerRunnable.scala b/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/WorkerRunnable.scala index 4f34bd913e..4f34bd913e 100644 --- a/yarn/2.0/src/main/scala/org/apache/spark/deploy/yarn/WorkerRunnable.scala +++ b/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/WorkerRunnable.scala diff --git a/yarn/2.0/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala b/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala index c8af653b3f..c8af653b3f 100644 --- a/yarn/2.0/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala +++ b/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala diff --git a/yarn/pom.xml b/yarn/pom.xml index 3300a465ef..7c145ef362 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -89,16 +89,16 @@ <profiles> <profile> - <id>hadoop2-yarn</id> + <id>yarn-alpha</id> <modules> - <module>2.0</module> + <module>alpha</module> </modules> </profile> <profile> - <id>hadoop2.2-yarn</id> + <id>yarn</id> <modules> - <module>2.2</module> + <module>stable</module> </modules> </profile> </profiles> diff --git a/yarn/2.0/pom.xml b/yarn/stable/pom.xml index ec6738fa38..45a14313f6 100644 --- a/yarn/2.0/pom.xml +++ b/yarn/stable/pom.xml @@ -25,9 +25,9 @@ </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-yarn-2.0_2.10</artifactId> + <artifactId>spark-yarn_2.10</artifactId> <packaging>jar</packaging> - <name>Spark Project YARN 2.0</name> + <name>Spark Project YARN Stable API</name> <url>http://spark.incubator.apache.org/</url> <build> diff --git a/yarn/2.2/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala b/yarn/stable/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala index 7c32e0ab9b..7c32e0ab9b 100644 --- a/yarn/2.2/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala +++ b/yarn/stable/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala diff --git a/yarn/2.2/src/main/scala/org/apache/spark/deploy/yarn/Client.scala b/yarn/stable/src/main/scala/org/apache/spark/deploy/yarn/Client.scala index a75066888c..a75066888c 100644 --- a/yarn/2.2/src/main/scala/org/apache/spark/deploy/yarn/Client.scala +++ b/yarn/stable/src/main/scala/org/apache/spark/deploy/yarn/Client.scala diff --git a/yarn/2.2/src/main/scala/org/apache/spark/deploy/yarn/WorkerLauncher.scala b/yarn/stable/src/main/scala/org/apache/spark/deploy/yarn/WorkerLauncher.scala index 4d9cca0766..4d9cca0766 100644 --- a/yarn/2.2/src/main/scala/org/apache/spark/deploy/yarn/WorkerLauncher.scala +++ b/yarn/stable/src/main/scala/org/apache/spark/deploy/yarn/WorkerLauncher.scala diff --git a/yarn/2.2/src/main/scala/org/apache/spark/deploy/yarn/WorkerRunnable.scala b/yarn/stable/src/main/scala/org/apache/spark/deploy/yarn/WorkerRunnable.scala index 9f5523c4b9..9f5523c4b9 100644 --- a/yarn/2.2/src/main/scala/org/apache/spark/deploy/yarn/WorkerRunnable.scala +++ b/yarn/stable/src/main/scala/org/apache/spark/deploy/yarn/WorkerRunnable.scala diff --git a/yarn/2.2/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala b/yarn/stable/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala index 8a9a73f5b4..8a9a73f5b4 100644 --- a/yarn/2.2/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala +++ b/yarn/stable/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala |