Repository: hadoop Updated Branches: refs/heads/trunk 8176ea7dc -> 3e85542a7
MAPREDUCE-6555. TestMRAppMaster fails on trunk. (Junping Du via ozawa) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3e85542a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3e85542a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3e85542a Branch: refs/heads/trunk Commit: 3e85542a7afb8bbbc19f2aa59da04ec824168c0e Parents: 8176ea7 Author: Tsuyoshi Ozawa <oz...@apache.org> Authored: Thu Nov 26 01:02:27 2015 +0900 Committer: Tsuyoshi Ozawa <oz...@apache.org> Committed: Thu Nov 26 01:02:27 2015 +0900 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 2 ++ .../java/org/apache/hadoop/mapreduce/v2/app/TestMRAppMaster.java | 2 ++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/3e85542a/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 1631668..26a0776 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -231,6 +231,8 @@ Trunk (Unreleased) MAPREDUCE-6540. TestMRTimelineEventHandling fails (sjlee) + MAPREDUCE-6555. TestMRAppMaster fails on trunk. (Junping Du via ozawa) + BREAKDOWN OF MAPREDUCE-2841 (NATIVE TASK) SUBTASKS MAPREDUCE-5985. native-task: Fix build on macosx. Contributed by http://git-wip-us.apache.org/repos/asf/hadoop/blob/3e85542a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestMRAppMaster.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestMRAppMaster.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestMRAppMaster.java index 9e0dafc..86fa33e 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestMRAppMaster.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestMRAppMaster.java @@ -151,6 +151,8 @@ public class TestMRAppMaster { String userName = "TestAppMasterUser"; JobConf conf = new JobConf(); conf.set(MRJobConfig.MR_AM_STAGING_DIR, stagingDir); + conf.setInt(org.apache.hadoop.mapreduce.lib.output.FileOutputCommitter. + FILEOUTPUTCOMMITTER_ALGORITHM_VERSION, 1); ApplicationAttemptId applicationAttemptId = ConverterUtils .toApplicationAttemptId(applicationAttemptIdStr); JobId jobId = TypeConverter.toYarn(
