Author: cnauroth
Date: Sat Apr 19 04:21:01 2014
New Revision: 1588606
URL: http://svn.apache.org/r1588606
Log:
MAPREDUCE-5642. Merging change r1588605 from trunk to branch-2.
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRChildTask.java
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1588606&r1=1588605&r2=1588606&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Sat
Apr 19 04:21:01 2014
@@ -44,6 +44,9 @@ Release 2.5.0 - UNRELEASED
MAPREDUCE-4937. MR AM handles an oversized split metainfo file poorly
(Eric Payne via jlowe)
+ MAPREDUCE-5642. TestMiniMRChildTask fails on Windows.
+ (Chuan Liu via cnauroth)
+
Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRChildTask.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRChildTask.java?rev=1588606&r1=1588605&r2=1588606&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRChildTask.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRChildTask.java
Sat Apr 19 04:21:01 2014
@@ -254,6 +254,19 @@ public class TestMiniMRChildTask {
checkEnv("NEW_PATH", File.pathSeparator + "/tmp", "noappend");
// check if X=$(tt's X var):/tmp for an old env variable inherited from
// the tt
+ if (Shell.WINDOWS) {
+ // On Windows, PATH is replaced one more time as part of default config
+ // of "mapreduce.admin.user.env", i.e. on Windows,
+ // "mapreduce.admin.user.env" is set to
+ // "PATH=%PATH%;%HADOOP_COMMON_HOME%\\bin"
+ String hadoopHome = System.getenv("HADOOP_COMMON_HOME");
+ if (hadoopHome == null) {
+ hadoopHome = "";
+ }
+ String hadoopLibLocation = hadoopHome + "\\bin";
+ path += File.pathSeparator + hadoopLibLocation;
+ path += File.pathSeparator + path;
+ }
checkEnv("PATH", path + File.pathSeparator + "/tmp", "noappend");
String jobLocalDir = job.get(MRJobConfig.JOB_LOCAL_DIR);
@@ -308,6 +321,19 @@ public class TestMiniMRChildTask {
checkEnv("NEW_PATH", File.pathSeparator + "/tmp", "noappend");
// check if X=$(tt's X var):/tmp for an old env variable inherited from
// the tt
+ if (Shell.WINDOWS) {
+ // On Windows, PATH is replaced one more time as part of default config
+ // of "mapreduce.admin.user.env", i.e. on Windows,
+ // "mapreduce.admin.user.env"
+ // is set to "PATH=%PATH%;%HADOOP_COMMON_HOME%\\bin"
+ String hadoopHome = System.getenv("HADOOP_COMMON_HOME");
+ if (hadoopHome == null) {
+ hadoopHome = "";
+ }
+ String hadoopLibLocation = hadoopHome + "\\bin";
+ path += File.pathSeparator + hadoopLibLocation;
+ path += File.pathSeparator + path;
+ }
checkEnv("PATH", path + File.pathSeparator + "/tmp", "noappend");
}
