Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BIGTOP-4084. Upgrade Tez to 0.10.3. #1246

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions bigtop-deploy/puppet/modules/tez/templates/environment
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@

PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
HADOOP_CLASSPATH="/etc/tez/conf:/usr/lib/tez/*:/usr/lib/tez/lib/*"
HADOOP_USER_CLASSPATH_FIRST="true"
5 changes: 5 additions & 0 deletions bigtop-packages/src/common/hadoop/init-hcfs.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -304,3 +304,8 @@ total_jars += copyJars(fs,
new Path(TEZ_APPS, "tez"))

LOG.info("Total jars copied into the DFS : " + total_jars);

def tez_tar_gz = TEZ_HOME + "lib/tez.tar.gz"
if (new File(tez_tar_gz).exists()) {
fs.copyFromLocalFile(new Path(tez_tar_gz), new Path(TEZ_APPS, "tez/lib"))
}
10 changes: 0 additions & 10 deletions bigtop-packages/src/common/tez/do-component-build
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,6 @@ set -xe

. `dirname $0`/bigtop.bom

if [ $HOSTTYPE = "powerpc64le" ] ; then
mvn install:install-file -DgroupId=com.google.protobuf -DartifactId=protoc -Dversion=2.5.0 \
-Dclassifier=linux-ppcle_64 -Dpackaging=exe -Dfile=/usr/local/protobuf-2.5.0/bin/protoc
fi

if [ $HOSTTYPE = "aarch64" ] ; then
mvn install:install-file -DgroupId=com.google.protobuf -DartifactId=protoc -Dversion=2.5.0 \
-Dclassifier=linux-aarch_64 -Dpackaging=exe -Dfile=/usr/local/protobuf-2.5.0/bin/protoc
fi

BUILD_TEZ_OPTS="clean package \
-Dtar -Dhadoop.version=${HADOOP_VERSION} \
-Phadoop28 \
Expand Down
50 changes: 0 additions & 50 deletions bigtop-packages/src/common/tez/patch2-TEZ-4319.diff

This file was deleted.

17 changes: 0 additions & 17 deletions bigtop-packages/src/common/tez/patch6-TEZ-4492.diff

This file was deleted.

16 changes: 0 additions & 16 deletions bigtop-packages/src/common/tez/patch7-TEZ-4493.diff

This file was deleted.

17 changes: 0 additions & 17 deletions bigtop-packages/src/common/tez/patch8-TEZ-4520.diff

This file was deleted.

4 changes: 2 additions & 2 deletions bigtop-packages/src/common/tez/tez-site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
<configuration>
<property>
<name>tez.lib.uris</name>
<value>${fs.default.name}/apps/tez/,${fs.default.name}/apps/tez/lib/</value>
<value>${fs.default.name}/apps/tez/lib/tez.tar.gz</value>
</property>

<property>
<name>tez.use.cluster.hadoop-libs</name>
<value>true</value>
<value>false</value>
</property>
</configuration>
2 changes: 1 addition & 1 deletion bigtop-tests/smoke-tests/tez/TestTezSmoke.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class TestTezSmoke {
static final String HADDOP_CMD = "hadoop jar "
static final String TEZ_EXMP_JAR = TEZ_HOME + "/tez-examples-*.jar "
static final String TEZ_TEST_JAR = TEZ_HOME + "/tez-tests-*.jar "
static final String SET_HADOOP_CLASSPATH = "export HADOOP_CLASSPATH=/etc/tez/conf:/usr/lib/tez/*:/usr/lib/tez/lib/*;"
static final String SET_HADOOP_CLASSPATH = "export HADOOP_CLASSPATH=/etc/tez/conf:/usr/lib/tez/*:/usr/lib/tez/lib/*; export HADOOP_USER_CLASSPATH_FIRST=true; "

@BeforeClass
static void TezSetUp() {
Expand Down
2 changes: 1 addition & 1 deletion bigtop.bom
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ bigtop {
name = 'tez'
rpm_pkg_suffix = "_" + bigtop.base_version.replace(".", "_")
relNotes = 'Apache TEZ'
version { base = '0.10.2'; pkg = base; release = 1 }
version { base = '0.10.3'; pkg = base; release = 1 }
tarball { destination = "apache-${name}-${version.base}-src.tar.gz"
source = destination }
url { download_path = "/$name/${version.base}/"
Expand Down