Repository: hadoop Updated Branches: refs/heads/branch-2.6 4573bbe33 -> 308e33685
MAPREDUCE-6123. TestCombineFileInputFormat incorrectly starts 2 MiniDFSCluster instances. Contributed by Chris Nauroth. (cherry picked from commit 777877d079ecb025c293deac741800800e413179) (cherry picked from commit f6278cbac50522302ee7ad3cbbe21d0aeefa76d8) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/308e3368 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/308e3368 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/308e3368 Branch: refs/heads/branch-2.6 Commit: 308e3368533990d3cde74c30cbc30be861c8809b Parents: 4573bbe Author: cnauroth <[email protected]> Authored: Thu Oct 9 22:35:58 2014 -0700 Committer: cnauroth <[email protected]> Committed: Thu Oct 9 22:40:34 2014 -0700 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/308e3368/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index d5baf1d..d9a2f63 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -186,6 +186,9 @@ Release 2.6.0 - UNRELEASED MAPREDUCE-6122. TestLineRecordReader may fail due to test data files checked out of git with incorrect line endings. (cnauroth) + MAPREDUCE-6123. TestCombineFileInputFormat incorrectly starts 2 + MiniDFSCluster instances. (cnauroth) + Release 2.5.1 - 2014-09-05 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/308e3368/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java index 4290914..db51ec6 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java @@ -1286,10 +1286,6 @@ public class TestCombineFileInputFormat extends TestCase { .build(); dfs.waitActive(); - dfs = new MiniDFSCluster.Builder(conf).racks(rack1).hosts(hosts1) - .build(); - dfs.waitActive(); - FileSystem fileSys = dfs.getFileSystem(); // Set up the following directory structure:
