From 409113d8f97fcfdb96cb028dbb6a20c9a1df81b0 Mon Sep 17 00:00:00 2001 From: Karthik Kambatla Date: Tue, 17 Feb 2015 14:38:00 -0800 Subject: [PATCH] MAPREDUCE-6234. TestHighRamJob fails due to the change in MAPREDUCE-5785. (Masatake Iwasaki via kasha) --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../apache/hadoop/mapred/gridmix/TestHighRamJob.java | 11 +++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index aebc71e2f8b..50e067c1a7c 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -175,6 +175,9 @@ Trunk (Unreleased) MAPREDUCE-4413. MR lib dir contains jdiff (which is gpl) (Nemon Lou via aw) + MAPREDUCE-6234. TestHighRamJob fails due to the change in MAPREDUCE-5785. + (Masatake Iwasaki via kasha) + BREAKDOWN OF MAPREDUCE-2841 (NATIVE TASK) SUBTASKS MAPREDUCE-5985. native-task: Fix build on macosx. Contributed by diff --git a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestHighRamJob.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestHighRamJob.java index 9cc84ea6d73..179c94112d3 100644 --- a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestHighRamJob.java +++ b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestHighRamJob.java @@ -28,6 +28,7 @@ import org.apache.hadoop.mapred.gridmix.DebugJobProducer.MockJob; import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.MRConfig; import org.apache.hadoop.mapreduce.MRJobConfig; +import org.apache.hadoop.mapreduce.TaskType; import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.tools.rumen.JobStory; @@ -92,15 +93,13 @@ public class TestHighRamJob { GridmixJob job = new DummyGridmixJob(simulatedJobConf, story); Job simulatedJob = job.getJob(); - Configuration simulatedConf = simulatedJob.getConfiguration(); + JobConf simulatedConf = (JobConf)simulatedJob.getConfiguration(); // check if the high ram properties are not set assertEquals(expectedMapMB, - simulatedConf.getLong(MRJobConfig.MAP_MEMORY_MB, - MRJobConfig.DEFAULT_MAP_MEMORY_MB)); + simulatedConf.getMemoryRequired(TaskType.MAP)); assertEquals(expectedReduceMB, - simulatedConf.getLong(MRJobConfig.REDUCE_MEMORY_MB, - MRJobConfig.DEFAULT_MAP_MEMORY_MB)); + simulatedConf.getMemoryRequired(TaskType.REDUCE)); } /** @@ -192,4 +191,4 @@ public class TestHighRamJob { assertNotNull(failed); assertTrue("Exception expected for exceeding reduce memory limit!", failed); } -} \ No newline at end of file +}