Author: bobby
Date: Mon Aug 20 19:51:49 2012
New Revision: 1375190
URL: http://svn.apache.org/viewvc?rev=1375190&view=rev
Log:
svn merge -c 1307124, 1307623, 1309583 FIXES: MAPREDUCE-4082 MAPREDUCE-4091 and
MAPREDUCE-4097 hadoop-mapreduce-client-app's mrapp-generated-classpath file
should not be in the module JAR (tucu)
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapreduce/v2/util/TestMRApps.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1375190&r1=1375189&r2=1375190&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Mon
Aug 20 19:51:49 2012
@@ -398,6 +398,14 @@ Release 0.23.3 - UNRELEASED
MAPREDUCE-4549. Distributed cache conflicts breaks backwards compatability
(Robert Evans via tgraves)
+ MAPREDUCE-4082. hadoop-mapreduce-client-app's mrapp-generated-classpath
+ file should not be in the module JAR (tucu)
+
+ MAPREDUCE-4091. tools testcases failing because of MAPREDUCE-4082 (tucu)
+
+ MAPREDUCE-4097. tools testcases fail because missing
mrapp-generated-classpath
+ file in classpath (rvs via tucu)
+
Release 0.23.2 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml?rev=1375190&r1=1375189&r2=1375190&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
Mon Aug 20 19:51:49 2012
@@ -89,21 +89,11 @@
<phase>test-compile</phase>
</execution>
</executions>
- </plugin>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>build-classpath</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>build-classpath</goal>
- </goals>
- <configuration>
- <outputFile>target/classes/mrapp-generated-classpath</outputFile>
- </configuration>
- </execution>
- </executions>
+ <configuration>
+ <excludes>
+ <exclude>mrapp-generated-classpath</exclude>
+ </excludes>
+ </configuration>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapreduce/v2/util/TestMRApps.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapreduce/v2/util/TestMRApps.java?rev=1375190&r1=1375189&r2=1375190&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapreduce/v2/util/TestMRApps.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapreduce/v2/util/TestMRApps.java
Mon Aug 20 19:51:49 2012
@@ -38,6 +38,7 @@ import org.apache.hadoop.mapreduce.v2.ap
import org.apache.hadoop.yarn.api.records.ApplicationId;
import org.apache.hadoop.yarn.api.records.LocalResource;
import org.apache.hadoop.yarn.api.records.LocalResourceType;
+import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider;
import org.junit.Test;
@@ -136,16 +137,12 @@ public class TestMRApps {
Job job = Job.getInstance();
Map<String, String> environment = new HashMap<String, String>();
MRApps.setClasspath(environment, job.getConfiguration());
- assertEquals("$PWD:$HADOOP_CONF_DIR:" +
- "$HADOOP_COMMON_HOME/share/hadoop/common/*:" +
- "$HADOOP_COMMON_HOME/share/hadoop/common/lib/*:" +
- "$HADOOP_HDFS_HOME/share/hadoop/hdfs/*:" +
- "$HADOOP_HDFS_HOME/share/hadoop/hdfs/lib/*:" +
- "$YARN_HOME/share/hadoop/yarn/*:" +
- "$YARN_HOME/share/hadoop/mapreduce/*:" +
- "$YARN_HOME/share/hadoop/mapreduce/lib/*:" +
- "job.jar:$PWD/*",
- environment.get("CLASSPATH"));
+ assertTrue(environment.get("CLASSPATH").startsWith("$PWD:"));
+ String confClasspath =
job.getConfiguration().get(YarnConfiguration.YARN_APPLICATION_CLASSPATH);
+ if (confClasspath != null) {
+ confClasspath = confClasspath.replaceAll(",\\s*", ":").trim();
+ }
+ assertTrue(environment.get("CLASSPATH").contains(confClasspath));
}
@Test public void testSetClasspathWithUserPrecendence() {
