Skip to content

Commit

Permalink
TEZ-3689. Change minimum hadoop version to 2.7.0. (sseth)
Browse files Browse the repository at this point in the history
  • Loading branch information
sidseth committed Apr 20, 2017
1 parent c9c6fbf commit ca607d6
Show file tree
Hide file tree
Showing 21 changed files with 22 additions and 341 deletions.
12 changes: 6 additions & 6 deletions BUILDING.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Requirements:
* Findbugs 2.0.2 or later (if running findbugs)
* ProtocolBuffer 2.5.0
* Internet connection for first build (to fetch all dependencies)
* Hadoop version should be 2.6.0 or higher.
* Hadoop version should be 2.7.0 or higher.

----------------------------------------------------------------------------------
Maven main modules:
Expand Down Expand Up @@ -43,7 +43,7 @@ Maven build goals:
* Run clover : mvn test -Pclover [-Dclover.license=${user.home}/clover.license]
* Run Rat : mvn apache-rat:check
* Build javadocs : mvn javadoc:javadoc
* Build distribution : mvn package[-Dhadoop.version=2.6.0]
* Build distribution : mvn package[-Dhadoop.version=2.7.0]
* Visualize state machines : mvn compile -Pvisualize -DskipTests=true

Build options:
Expand All @@ -64,7 +64,7 @@ Tests options:
----------------------------------------------------------------------------------
Building against a specific version of hadoop:

Tez runs on top of Apache Hadoop YARN and requires hadoop version 2.6.0 or higher.
Tez runs on top of Apache Hadoop YARN and requires hadoop version 2.7.0 or higher.

By default, it can be compiled against other compatible hadoop versions by just
specifying the hadoop.version. For example, to build tez against hadoop 3.0.0-SNAPSHOT
Expand All @@ -75,15 +75,15 @@ To skip Tests and java docs

$ mvn package -Dhadoop.version=3.0.0-SNAPSHOT -DskipTests -Dmaven.javadoc.skip=true

However, to build against hadoop versions lower or higher than 2.6.0, you will need to do the
However, to build against hadoop versions higher than 2.7.0, you will need to do the
following:

For Hadoop version X where X >= 2.8.0

$ mvn package -Dhadoop.version=${X} -Phadoop28 -P\!hadoop26
$ mvn package -Dhadoop.version=${X} -Phadoop28 -P\!hadoop27

For recent versions of Hadoop (which do not bundle aws and azure by default),
you can bundle AWS-S3 (2.6.0+) or Azure (2.7.0+) support:
you can bundle AWS-S3 (2.7.0+) or Azure (2.7.0+) support:

$ mvn package -Dhadoop.version=${X} -Paws -Pazure

Expand Down
4 changes: 3 additions & 1 deletion docs/src/site/markdown/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ Install/Deploy Instructions for Tez
---------------------------------------------------------------------------
Replace x.y.z with the tez release number that you are using. E.g. 0.5.0. For Tez
versions 0.8.3 and higher, Tez needs Apache Hadoop to be of version 2.6.0 or higher.
For Tez version 0.9.0 and higher, Tez needs Apache Hadoop to be version 2.7.0
or higher.

1. Deploy Apache Hadoop using version of 2.6.0 or higher.
1. Deploy Apache Hadoop using version of 2.7.0 or higher.
- You need to change the value of the hadoop.version property in the
top-level pom.xml to match the version of the hadoop branch being used.

Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

16 changes: 0 additions & 16 deletions hadoop-shim-impls/hadoop-shim-2.6/findbugs-exclude.xml

This file was deleted.

56 changes: 0 additions & 56 deletions hadoop-shim-impls/hadoop-shim-2.6/pom.xml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<version>0.9.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>hadoop-shim-2.4</artifactId>
<artifactId>hadoop-shim-2.7</artifactId>

<dependencies>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class HadoopShim25_26_27Provider extends HadoopShimProvider {
@Override
public HadoopShim createHadoopShim(String hadoopVersion, int majorVersion, int minorVersion) {
if (majorVersion == 2 && (minorVersion == 5 || minorVersion == 6 || minorVersion == 7)) {
return new HadoopShim26();
return new HadoopShim27();
}
return null;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import org.apache.hadoop.yarn.proto.YarnServiceProtos.SchedulerResourceTypes;

@Private
public class HadoopShim26 extends HadoopShim {
public class HadoopShim27 extends HadoopShim {

@Override
public void setHadoopCallerContext(String context) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public void testShimProvider() {
Assert.assertNotNull(provider.createHadoopShim("foo", 2, 6));
Assert.assertNotNull(provider.createHadoopShim("foo", 2, 7));

Assert.assertEquals(HadoopShim26.class,
Assert.assertEquals(HadoopShim27.class,
provider.createHadoopShim("foo", 2, 7).getClass());
}

Expand All @@ -51,7 +51,7 @@ public void testLoaderOverride() {
HadoopShimsLoader loader = new HadoopShimsLoader(conf, true);
HadoopShim shim = loader.getHadoopShim();
Assert.assertNotNull(shim);
Assert.assertEquals(HadoopShim26.class, shim.getClass());
Assert.assertEquals(HadoopShim27.class, shim.getClass());
}

@Test
Expand Down
13 changes: 2 additions & 11 deletions hadoop-shim-impls/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,12 @@

<profiles>
<profile>
<id>hadoop24</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<modules>
<module>hadoop-shim-2.4</module>
</modules>
</profile>
<profile>
<id>hadoop26</id>
<id>hadoop27</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>hadoop-shim-2.6</module>
<module>hadoop-shim-2.7</module>
</modules>
</profile>
<profile>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<properties>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<clover.license>${user.home}/clover.license</clover.license>
<hadoop.version>2.6.0</hadoop.version>
<hadoop.version>2.7.0</hadoop.version>
<jetty.version>6.1.26</jetty.version>
<pig.version>0.13.0</pig.version>
<javac.version>1.7</javac.version>
Expand Down
Loading

0 comments on commit ca607d6

Please sign in to comment.