Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAPREDUCE-5259. Merging change r1492364 from trunk to branch-2. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492367 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris Nauroth 2013-06-12 19:00:05 +00:00
parent 46e514b06b
commit 87c96a022e
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -395,6 +395,9 @@ Release 2.1.0-beta - UNRELEASED
MAPREDUCE-5315. DistCp reports success even on failure. (mithun and jlowe MAPREDUCE-5315. DistCp reports success even on failure. (mithun and jlowe
via daryn) via daryn)
MAPREDUCE-5259. TestTaskLog fails on Windows because of path separators
missmatch. (Ivan Mitic via cnauroth)
BREAKDOWN OF HADOOP-8562 SUBTASKS BREAKDOWN OF HADOOP-8562 SUBTASKS
MAPREDUCE-4739. Some MapReduce tests fail to find winutils. MAPREDUCE-4739. Some MapReduce tests fail to find winutils.

10
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestTaskLog.java
View File

@ -55,7 +55,8 @@ public class TestTaskLog {
when(taid.toString()).thenReturn("JobId"); when(taid.toString()).thenReturn("JobId");
File f = TaskLog.getTaskLogFile(taid, true, LogName.STDOUT); File f = TaskLog.getTaskLogFile(taid, true, LogName.STDOUT);
assertTrue(f.getAbsolutePath().endsWith("testString/stdout")); assertTrue(f.getAbsolutePath().endsWith("testString"
+ File.separatorChar + "stdout"));
// test getRealTaskLogFileLocation // test getRealTaskLogFileLocation
@ -69,11 +70,14 @@ public class TestTaskLog {
TaskLog.syncLogs("location", taid, true); TaskLog.syncLogs("location", taid, true);
assertTrue(indexFile.getAbsolutePath().endsWith( assertTrue(indexFile.getAbsolutePath().endsWith(
"userlogs/job_job_0001/JobId.cleanup/log.index")); "userlogs" + File.separatorChar + "job_job_0001"
+ File.separatorChar + "JobId.cleanup"
+ File.separatorChar + "log.index"));
f = TaskLog.getRealTaskLogFileLocation(taid, true, LogName.DEBUGOUT); f = TaskLog.getRealTaskLogFileLocation(taid, true, LogName.DEBUGOUT);
if (f != null) { if (f != null) {
assertTrue(f.getAbsolutePath().endsWith("location/debugout")); assertTrue(f.getAbsolutePath().endsWith("location"
+ File.separatorChar + "debugout"));
FileUtils.copyFile(indexFile, f); FileUtils.copyFile(indexFile, f);
} }
// test obtainLogDirOwner // test obtainLogDirOwner