Author: virag
Date: Wed Oct 3 01:56:51 2012
New Revision: 1393256
URL: http://svn.apache.org/viewvc?rev=1393256&view=rev
Log:
OOZIE-1006 Oozie fails to add required dependency for Hadoop 2.0.2 (venkatesh
via virag)
Modified:
oozie/branches/branch-3.3/distro/src/main/bin/addtowar.sh
oozie/branches/branch-3.3/distro/src/main/bin/oozie-setup.sh
oozie/branches/branch-3.3/release-log.txt
Modified: oozie/branches/branch-3.3/distro/src/main/bin/addtowar.sh
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/distro/src/main/bin/addtowar.sh?rev=1393256&r1=1393255&r2=1393256&view=diff
==============================================================================
--- oozie/branches/branch-3.3/distro/src/main/bin/addtowar.sh (original)
+++ oozie/branches/branch-3.3/distro/src/main/bin/addtowar.sh Wed Oct 3
01:56:51 2012
@@ -111,9 +111,13 @@ function getHadoopJars() {
suffix="-[0-9.]*"
#List is separated by ":"
hadoopJars="hadoop-mapreduce-client-core${suffix}.jar:hadoop-mapreduce-client-common${suffix}.jar:hadoop-mapreduce-client-jobclient${suffix}.jar:hadoop-mapreduce-client-app${suffix}.jar:hadoop-yarn-common${suffix}.jar:hadoop-yarn-api${suffix}.jar:hadoop-hdfs${suffix}.jar:hadoop-common${suffix}.jar:hadoop-auth${suffix}.jar:guava*.jar:protobuf-*.jar:avro-ipc-*.jar:jackson-core-asl-*.jar:jackson-mapper-asl-*.jar:commons-configuration-*.jar"
+ elif [[ "${version}" =~ 2.* ]]; then
+ suffix="-[0-9.]*"
+ #List is separated by ":"
+
hadoopJars="hadoop-mapreduce-client-core${suffix}.jar:hadoop-mapreduce-client-common${suffix}.jar:hadoop-mapreduce-client-jobclient${suffix}.jar:hadoop-mapreduce-client-app${suffix}.jar:hadoop-yarn-common${suffix}.jar:hadoop-yarn-api${suffix}.jar:hadoop-yarn-client${suffix}.jar:hadoop-hdfs${suffix}.jar:hadoop-common${suffix}.jar:hadoop-auth${suffix}.jar:guava*.jar:protobuf-*.jar:jackson-core-asl-*.jar:jackson-mapper-asl-*.jar:commons-configuration-*.jar:commons-cli-*.jar"
else
echo
- echo "Exiting: Unsupported Hadoop version '${hadoopVer}', supported
versions: 0.20.1, 0.20.2, 0.20.104, 0.20.200 and 0.23.x"
+ echo "Exiting: Unsupported Hadoop version '${hadoopVer}', supported
versions: 0.20.1, 0.20.2, 0.20.104, 0.20.200, 0.23.x and 2.x"
echo
cleanUp
exit -1;
Modified: oozie/branches/branch-3.3/distro/src/main/bin/oozie-setup.sh
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/distro/src/main/bin/oozie-setup.sh?rev=1393256&r1=1393255&r2=1393256&view=diff
==============================================================================
--- oozie/branches/branch-3.3/distro/src/main/bin/oozie-setup.sh (original)
+++ oozie/branches/branch-3.3/distro/src/main/bin/oozie-setup.sh Wed Oct 3
01:56:51 2012
@@ -21,7 +21,7 @@ function printUsage() {
echo
echo " Usage : oozie-setup.sh <OPTIONS>"
echo " [-extjs EXTJS_PATH] (expanded or ZIP, to enable the Oozie
webconsole)"
- echo " [-hadoop HADOOP_VERSION HADOOP_PATH] (Hadoop version
[0.20.1|0.20.2|0.20.104|0.20.200]"
+ echo " [-hadoop HADOOP_VERSION HADOOP_PATH] (Hadoop version
[0.20.1|0.20.2|0.20.104|0.20.200|0.23.x|2.x]"
echo " and Hadoop install
dir)"
echo " [-jars JARS_PATH] (multiple JAR path separated by ':')"
echo " (without options does default setup, without the Oozie
webconsole)"
Modified: oozie/branches/branch-3.3/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/release-log.txt?rev=1393256&r1=1393255&r2=1393256&view=diff
==============================================================================
--- oozie/branches/branch-3.3/release-log.txt (original)
+++ oozie/branches/branch-3.3/release-log.txt Wed Oct 3 01:56:51 2012
@@ -1,5 +1,6 @@
-- Oozie 3.3.0 release (unreleased)
+OOZIE-1006 Oozie fails to add required dependency for Hadoop 2.0.2 (venkatesh
via virag)
OOZIE-975 Test cases should not load all the services classes (virag)
OOZIE-990 TestLogStreamer.testStreamLog fails in very rare cases (rkanter via
virag)
OOZIE-989 Testcases failing intermittently where coordinator jobs are in
catchup mode (virag)
