From 58676edf98cf8e1c9179ac8e89923c16bc3df3b5 Mon Sep 17 00:00:00 2001 From: Arun Murthy Date: Thu, 25 Aug 2011 19:13:50 +0000 Subject: [PATCH] MAPREDUCE-2879. Fix version for MR-279 to 0.23.0. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1161705 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 2 ++ hadoop-mapreduce-project/INSTALL | 18 +++++++++--------- .../hadoop-mapreduce-client-app/pom.xml | 2 +- .../hadoop/mapreduce/v2/MRConstants.java | 2 +- .../src/main/resources/yarn-default.xml | 2 +- hadoop-mapreduce-project/hadoop-yarn/pom.xml | 2 +- hadoop-mapreduce-project/pom.xml | 4 ++-- 7 files changed, 17 insertions(+), 15 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 84d0239a97..c77c764b21 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -1146,6 +1146,8 @@ Trunk (unreleased changes) MAPREDUCE-2796. Set start times for MR applications for clients to see. (Devaraj K via acmurthy) + MAPREDUCE-2879. Fix version for MR-279 to 0.23.0. (acmurthy) + Release 0.22.0 - Unreleased INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/INSTALL b/hadoop-mapreduce-project/INSTALL index 695f64e468..fbdb6ca184 100644 --- a/hadoop-mapreduce-project/INSTALL +++ b/hadoop-mapreduce-project/INSTALL @@ -30,7 +30,7 @@ Copy in build.properties if appropriate - make sure eclipse.home not set ant veryclean tar -Dresolvers=internal You will see a tarball in -ls target/hadoop-mapreduce-1.0-SNAPSHOT-all.tar.gz +ls target/hadoop-mapreduce-0.23.0-SNAPSHOT-all.tar.gz Step 6) Untar the tarball in a clean and different directory. say YARN_HOME. @@ -73,13 +73,13 @@ Step 10) Modify mapred-site.xml to use yarn framework Step 11) Create the following symlinks in $HADOOP_COMMON_HOME/share/hadoop/common/lib -ln -s $YARN_HOME/modules/hadoop-mapreduce-client-app-1.0-SNAPSHOT.jar . -ln -s $YARN_HOME/modules/hadoop-yarn-api-1.0-SNAPSHOT.jar . -ln -s $YARN_HOME/modules/hadoop-mapreduce-client-common-1.0-SNAPSHOT.jar . -ln -s $YARN_HOME/modules/hadoop-yarn-common-1.0-SNAPSHOT.jar . -ln -s $YARN_HOME/modules/hadoop-mapreduce-client-core-1.0-SNAPSHOT.jar . -ln -s $YARN_HOME/modules/hadoop-yarn-server-common-1.0-SNAPSHOT.jar . -ln -s $YARN_HOME/modules/hadoop-mapreduce-client-jobclient-1.0-SNAPSHOT.jar . +ln -s $YARN_HOME/modules/hadoop-mapreduce-client-app-0.23.0-SNAPSHOT.jar . +ln -s $YARN_HOME/modules/hadoop-yarn-api-0.23.0-SNAPSHOT.jar . +ln -s $YARN_HOME/modules/hadoop-mapreduce-client-common-0.23.0-SNAPSHOT.jar . +ln -s $YARN_HOME/modules/hadoop-yarn-common-0.23.0-SNAPSHOT.jar . +ln -s $YARN_HOME/modules/hadoop-mapreduce-client-core-0.23.0-SNAPSHOT.jar . +ln -s $YARN_HOME/modules/hadoop-yarn-server-common-0.23.0-SNAPSHOT.jar . +ln -s $YARN_HOME/modules/hadoop-mapreduce-client-jobclient-0.23.0-SNAPSHOT.jar . Step 12) cd $YARN_HOME @@ -92,7 +92,7 @@ Step 15) bin/yarn-daemon.sh start historyserver Step 16) You are all set, an example on how to run a mapreduce job is: cd $HADOOP_MAPRED_HOME ant examples -Dresolvers=internal -$HADOOP_COMMON_HOME/bin/hadoop jar $HADOOP_MAPRED_HOME/build/hadoop-mapreduce-examples-0.23.0-SNAPSHOT.jar randomwriter -Dmapreduce.job.user.name=$USER -Dmapreduce.clientfactory.class.name=org.apache.hadoop.mapred.YarnClientFactory -Dmapreduce.randomwriter.bytespermap=10000 -Ddfs.blocksize=536870912 -Ddfs.block.size=536870912 -libjars $YARN_HOME/modules/hadoop-mapreduce-client-jobclient-1.0-SNAPSHOT.jar output +$HADOOP_COMMON_HOME/bin/hadoop jar $HADOOP_MAPRED_HOME/build/hadoop-mapreduce-examples-0.23.0-SNAPSHOT.jar randomwriter -Dmapreduce.job.user.name=$USER -Dmapreduce.clientfactory.class.name=org.apache.hadoop.mapred.YarnClientFactory -Dmapreduce.randomwriter.bytespermap=0.23.000 -Ddfs.blocksize=536870912 -Ddfs.block.size=536870912 -libjars $YARN_HOME/modules/hadoop-mapreduce-client-jobclient-0.23.0-SNAPSHOT.jar output The output on the command line should be almost similar to what you see in the JT/TT setup (Hadoop 0.20/0.21) diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml index 26f007658b..1079f479cb 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml @@ -101,7 +101,7 @@ - diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/MRConstants.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/MRConstants.java index 0f919db980..55ed03ec82 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/MRConstants.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/MRConstants.java @@ -40,7 +40,7 @@ public interface MRConstants { public static final String JOB_JAR = "job.jar"; public static final String HADOOP_MAPREDUCE_CLIENT_APP_JAR_NAME = - "hadoop-mapreduce-client-app-1.0-SNAPSHOT.jar"; + "hadoop-mapreduce-client-app-0.23.0-SNAPSHOT.jar"; public static final String YARN_MAPREDUCE_APP_JAR_PATH = "$YARN_HOME/modules/" + HADOOP_MAPREDUCE_CLIENT_APP_JAR_NAME; diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/resources/yarn-default.xml b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/resources/yarn-default.xml index eded765245..5998fd0717 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/resources/yarn-default.xml +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/resources/yarn-default.xml @@ -188,7 +188,7 @@ mapreduce.job.jar - + diff --git a/hadoop-mapreduce-project/hadoop-yarn/pom.xml b/hadoop-mapreduce-project/hadoop-yarn/pom.xml index ca5499fa89..825d39237d 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/pom.xml +++ b/hadoop-mapreduce-project/hadoop-yarn/pom.xml @@ -27,7 +27,7 @@ 600000 0.23.0-SNAPSHOT 0.23.0-SNAPSHOT - 1.0-SNAPSHOT + 0.23.0-SNAPSHOT ${project.build.directory}/saner-pom.xml ${install.pom} ${basedir} diff --git a/hadoop-mapreduce-project/pom.xml b/hadoop-mapreduce-project/pom.xml index 9df5be122c..358bd81bca 100644 --- a/hadoop-mapreduce-project/pom.xml +++ b/hadoop-mapreduce-project/pom.xml @@ -28,8 +28,8 @@ 600000 0.23.0-SNAPSHOT 0.23.0-SNAPSHOT - 1.0-SNAPSHOT - 1.0-SNAPSHOT + 0.23.0-SNAPSHOT + 0.23.0-SNAPSHOT ${project.build.directory}/saner-pom.xml ${install.pom} once