You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by jl...@apache.org on 2013/10/29 15:07:45 UTC
svn commit: r1536726 - in
/hadoop/common/branches/branch-2.2/hadoop-mapreduce-project: CHANGES.txt
hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestUserDefinedCounters.java
Author: jlowe
Date: Tue Oct 29 14:07:45 2013
New Revision: 1536726
URL: http://svn.apache.org/r1536726
Log:
svn merge -c 1536724 FIXES: MAPREDUCE-5598. TestUserDefinedCounters.testMapReduceJob is flakey. Contributed by Robert Kanter
Modified:
hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestUserDefinedCounters.java
Modified: hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/CHANGES.txt?rev=1536726&r1=1536725&r2=1536726&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/CHANGES.txt Tue Oct 29 14:07:45 2013
@@ -40,6 +40,9 @@ Release 2.2.1 - UNRELEASED
MAPREDUCE-5561. org.apache.hadoop.mapreduce.v2.app.job.impl.TestJobImpl
testcase failing on trunk (Karthik Kambatla via jlowe)
+ MAPREDUCE-5598. TestUserDefinedCounters.testMapReduceJob is flakey
+ (Robert Kanter via jlowe)
+
Release 2.2.0 - 2013-10-13
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestUserDefinedCounters.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestUserDefinedCounters.java?rev=1536726&r1=1536725&r2=1536726&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestUserDefinedCounters.java (original)
+++ hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestUserDefinedCounters.java Tue Oct 29 14:07:45 2013
@@ -40,7 +40,8 @@ public class TestUserDefinedCounters ext
private static String TEST_ROOT_DIR =
new File(System.getProperty("test.build.data", "/tmp")).toURI()
- .toString().replace(' ', '+');
+ .toString().replace(' ', '+')
+ + "/" + TestUserDefinedCounters.class.getName();
private final Path INPUT_DIR = new Path(TEST_ROOT_DIR + "/input");
private final Path OUTPUT_DIR = new Path(TEST_ROOT_DIR + "/out");
@@ -61,7 +62,7 @@ public class TestUserDefinedCounters ext
}
private void cleanAndCreateInput(FileSystem fs) throws IOException {
- fs.delete(INPUT_FILE, true);
+ fs.delete(INPUT_DIR, true);
fs.delete(OUTPUT_DIR, true);
OutputStream os = fs.create(INPUT_FILE);