Sfoglia il codice sorgente

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
Arun Murthy 13 anni fa
parent
commit
58676edf98

+ 2 - 0
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

+ 9 - 9
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)
 

+ 1 - 1
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml

@@ -101,7 +101,7 @@
               <target>
                 <symlink link="${applink.base}.jar"
                     resource="mr-app.jar" failonerror="false"/>
-                <symlink link="${applink.base}-1.0-SNAPSHOT.jar"
+                <symlink link="${applink.base}-0.23.0-SNAPSHOT.jar"
                     resource="mr-app.jar" failonerror="false"/>
               </target>
             </configuration>

+ 1 - 1
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;

+ 1 - 1
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/resources/yarn-default.xml

@@ -188,7 +188,7 @@
   <property>
     <name>mapreduce.job.jar</name>
     <value></value>
-    <!--<value>~/Workspace/eclipse-workspace/yarn/yarn-mapreduce/yarn-mapreduce-app/target/yarn-mapreduce-app-1.0-SNAPSHOT.jar</value>-->
+    <!--<value>~/Workspace/eclipse-workspace/yarn/yarn-mapreduce/yarn-mapreduce-app/target/yarn-mapreduce-app-0.23.0-SNAPSHOT.jar</value>-->
   </property>
 
   <property>

+ 1 - 1
hadoop-mapreduce-project/hadoop-yarn/pom.xml

@@ -27,7 +27,7 @@
     <test.timeout>600000</test.timeout>
     <hadoop-common.version>0.23.0-SNAPSHOT</hadoop-common.version>
     <hadoop-hdfs.version>0.23.0-SNAPSHOT</hadoop-hdfs.version>
-    <yarn.version>1.0-SNAPSHOT</yarn.version>
+    <yarn.version>0.23.0-SNAPSHOT</yarn.version>
     <install.pom>${project.build.directory}/saner-pom.xml</install.pom>
     <install.file>${install.pom}</install.file>
     <yarn.basedir>${basedir}</yarn.basedir>

+ 2 - 2
hadoop-mapreduce-project/pom.xml

@@ -28,8 +28,8 @@
     <test.timeout>600000</test.timeout>
     <hadoop-common.version>0.23.0-SNAPSHOT</hadoop-common.version>
     <hadoop-hdfs.version>0.23.0-SNAPSHOT</hadoop-hdfs.version>
-    <hadoop-mapreduce.version>1.0-SNAPSHOT</hadoop-mapreduce.version>
-    <yarn.version>1.0-SNAPSHOT</yarn.version>
+    <hadoop-mapreduce.version>0.23.0-SNAPSHOT</hadoop-mapreduce.version>
+    <yarn.version>0.23.0-SNAPSHOT</yarn.version>
     <install.pom>${project.build.directory}/saner-pom.xml</install.pom>
     <install.file>${install.pom}</install.file>
     <fork.mode>once</fork.mode>