Return-Path: X-Original-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 274D011944 for ; Sat, 19 Apr 2014 04:07:51 +0000 (UTC) Received: (qmail 14303 invoked by uid 500); 19 Apr 2014 04:07:49 -0000 Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org Received: (qmail 14020 invoked by uid 500); 19 Apr 2014 04:07:49 -0000 Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: mapreduce-dev@hadoop.apache.org Delivered-To: mailing list mapreduce-commits@hadoop.apache.org Received: (qmail 14010 invoked by uid 99); 19 Apr 2014 04:07:47 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 19 Apr 2014 04:07:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 19 Apr 2014 04:07:46 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2C6562388868; Sat, 19 Apr 2014 04:07:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1588605 - in /hadoop/common/trunk/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRChildTask.java Date: Sat, 19 Apr 2014 04:07:23 -0000 To: mapreduce-commits@hadoop.apache.org From: cnauroth@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140419040723.2C6562388868@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cnauroth Date: Sat Apr 19 04:07:22 2014 New Revision: 1588605 URL: http://svn.apache.org/r1588605 Log: MAPREDUCE-5642. TestMiniMRChildTask fails on Windows. Contributed by Chuan Liu. Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRChildTask.java Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1588605&r1=1588604&r2=1588605&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Sat Apr 19 04:07:22 2014 @@ -180,6 +180,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/trunk/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/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRChildTask.java?rev=1588605&r1=1588604&r2=1588605&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRChildTask.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRChildTask.java Sat Apr 19 04:07:22 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"); }