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

MAPREDUCE-6123. TestCombineFileInputFormat incorrectly starts 2 MiniDFSCluster instances. Contributed by Chris Nauroth. 

(cherry picked from commit 777877d079)
(cherry picked from commit f6278cbac5)
This commit is contained in:
cnauroth 2014-10-09 22:35:58 -07:00
parent 4573bbe33d
commit 308e336853
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -186,6 +186,9 @@ Release 2.6.0 - UNRELEASED
MAPREDUCE-6122. TestLineRecordReader may fail due to test data files checked MAPREDUCE-6122. TestLineRecordReader may fail due to test data files checked
out of git with incorrect line endings. (cnauroth) out of git with incorrect line endings. (cnauroth)
MAPREDUCE-6123. TestCombineFileInputFormat incorrectly starts 2
MiniDFSCluster instances. (cnauroth)
Release 2.5.1 - 2014-09-05 Release 2.5.1 - 2014-09-05
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

4
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java
View File

@ -1286,10 +1286,6 @@ public class TestCombineFileInputFormat extends TestCase {
.build(); .build();
dfs.waitActive(); dfs.waitActive();
dfs = new MiniDFSCluster.Builder(conf).racks(rack1).hosts(hosts1)
.build();
dfs.waitActive();
FileSystem fileSys = dfs.getFileSystem(); FileSystem fileSys = dfs.getFileSystem();
// Set up the following directory structure: // Set up the following directory structure: