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 bo...@apache.org on 2012/07/09 18:15:13 UTC
svn commit: r1359253 - in
/hadoop/common/branches/branch-2/hadoop-mapreduce-project: CHANGES.txt
hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestFileInputFormat.java
Author: bobby
Date: Mon Jul 9 16:15:12 2012
New Revision: 1359253
URL: http://svn.apache.org/viewvc?rev=1359253&view=rev
Log:
svn merge -c 1359252 FIXES: MAPREDUCE-4402. TestFileInputFormat fails intermittently (Jason Lowe via bobby)
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/TestFileInputFormat.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=1359253&r1=1359252&r2=1359253&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Mon Jul 9 16:15:12 2012
@@ -532,6 +532,9 @@ Release 0.23.3 - UNRELEASED
space due to org.apache.hadoop.fs.LocalDirAllocator.contexts (Devaraj K
via bobby)
+ MAPREDUCE-4402. TestFileInputFormat fails intermittently (Jason Lowe via
+ bobby)
+
Release 0.23.2 - 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/TestFileInputFormat.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/TestFileInputFormat.java?rev=1359253&r1=1359252&r2=1359253&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestFileInputFormat.java (original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestFileInputFormat.java Mon Jul 9 16:15:12 2012
@@ -97,13 +97,16 @@ public class TestFileInputFormat extends
private void createInputs(FileSystem fs, Path inDir, String fileName)
throws IOException {
// create a multi-block file on hdfs
- DataOutputStream out = fs.create(new Path(inDir, fileName), true, 4096,
- (short) 2, 512, null);
+ Path path = new Path(inDir, fileName);
+ final short replication = 2;
+ DataOutputStream out = fs.create(path, true, 4096,
+ replication, 512, null);
for(int i=0; i < 1000; ++i) {
out.writeChars("Hello\n");
}
out.close();
System.out.println("Wrote file");
+ DFSTestUtil.waitReplication(fs, path, replication);
}
public void testNumInputs() throws Exception {