From 3c7813bbad3fbed264af39033a90949deef5a0a9 Mon Sep 17 00:00:00 2001
From: Arun Murthy <acmurthy@apache.org>
Date: Wed, 2 Oct 2013 21:08:27 +0000
Subject: [PATCH] MAPREDUCE-5459. Update documentation on how to run MRv1
 examples on YARN. Contributed by Zhijie Shen.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1528626 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-mapreduce-project/CHANGES.txt          |  3 +++
 ...educe_Compatibility_Hadoop1_Hadoop2.apt.vm | 27 ++++++++++++-------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 40852d7e25..a5590213ca 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -265,6 +265,9 @@ Release 2.1.2 - UNRELEASED
     isSplittable(FileSystem, Path) api and ensuring semantic compatibility.
     (Robert Kanter via acmurthy)
 
+    MAPREDUCE-5459. Update documentation on how to run MRv1 examples on YARN.
+    (Zhijie Shen via acmurthy)
+
 Release 2.1.1-beta - 2013-09-23
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/apt/MapReduce_Compatibility_Hadoop1_Hadoop2.apt.vm b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/apt/MapReduce_Compatibility_Hadoop1_Hadoop2.apt.vm
index aaa5f176e3..bdc2f36a0d 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/apt/MapReduce_Compatibility_Hadoop1_Hadoop2.apt.vm
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/apt/MapReduce_Compatibility_Hadoop1_Hadoop2.apt.vm
@@ -96,12 +96,21 @@ Apache Hadoop MapReduce - Migrating from Apache Hadoop 1.x to Apache Hadoop 2.x
 
 * {Malicious}
 
- For the users who are going to try <<<hadoop-examples-1.x.x.jar>>> on YARN,
- please note that <<<hadoop -jar hadoop-examples-1.x.x.jar>>> will still use
- <<<hadoop-mapreduce-examples-2.x.x.jar>>>, which is installed together with
- other MRv2 jars. By default Hadoop framework jars appear before the users'
- jars in the classpath, such that the classes from the 2.x.x jar will still be
- picked. Users should either remove <<<hadoop-mapreduce-examples-2.x.x.jar>>>
- from the classpath or set <<<HADOOP_USER_CLASSPATH_FIRST=true>>> and
- <<<HADOOP_CLASSPATH=...:hadoop-examples-1.x.x.jar>>> to run their target
- examples jar.
+  For the users who are going to try <<<hadoop-examples-1.x.x.jar>>> on YARN,
+  please note that <<<hadoop -jar hadoop-examples-1.x.x.jar>>> will still use
+  <<<hadoop-mapreduce-examples-2.x.x.jar>>>, which is installed together with
+  other MRv2 jars. By default Hadoop framework jars appear before the users'
+  jars in the classpath, such that the classes from the 2.x.x jar will still be
+  picked. Users should remove <<<hadoop-mapreduce-examples-2.x.x.jar>>>
+  from the classpath of all the nodes in a cluster. Otherwise, users need to
+  set <<<HADOOP_USER_CLASSPATH_FIRST=true>>> and
+  <<<HADOOP_CLASSPATH=...:hadoop-examples-1.x.x.jar>>> to run their target
+  examples jar, and add the following configuration in <<<mapred-site.xml>>> to
+  make the processes in YARN containers pick this jar as well.
+
++---+
+    <property>
+        <name>mapreduce.job.user.classpath.first</name>
+        <value>true</value>
+    </property>
++---+