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

MAPREDUCE-6234. TestHighRamJob fails due to the change in MAPREDUCE-5785. (Masatake Iwasaki via kasha)

This commit is contained in:
Karthik Kambatla 2015-02-17 14:38:00 -08:00
parent 043e44bc36
commit 409113d8f9
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,6 +175,9 @@ Trunk (Unreleased)
MAPREDUCE-4413. MR lib dir contains jdiff (which is gpl) (Nemon Lou via aw) 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 BREAKDOWN OF MAPREDUCE-2841 (NATIVE TASK) SUBTASKS
MAPREDUCE-5985. native-task: Fix build on macosx. Contributed by MAPREDUCE-5985. native-task: Fix build on macosx. Contributed by

9
hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestHighRamJob.java
View File

@ -28,6 +28,7 @@ import org.apache.hadoop.mapred.gridmix.DebugJobProducer.MockJob;
import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.MRConfig; import org.apache.hadoop.mapreduce.MRConfig;
import org.apache.hadoop.mapreduce.MRJobConfig; import org.apache.hadoop.mapreduce.MRJobConfig;
import org.apache.hadoop.mapreduce.TaskType;
import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig; import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig;
import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.tools.rumen.JobStory; import org.apache.hadoop.tools.rumen.JobStory;
@ -92,15 +93,13 @@ public class TestHighRamJob {
GridmixJob job = new DummyGridmixJob(simulatedJobConf, story); GridmixJob job = new DummyGridmixJob(simulatedJobConf, story);
Job simulatedJob = job.getJob(); Job simulatedJob = job.getJob();
Configuration simulatedConf = simulatedJob.getConfiguration(); JobConf simulatedConf = (JobConf)simulatedJob.getConfiguration();
// check if the high ram properties are not set // check if the high ram properties are not set
assertEquals(expectedMapMB, assertEquals(expectedMapMB,
simulatedConf.getLong(MRJobConfig.MAP_MEMORY_MB, simulatedConf.getMemoryRequired(TaskType.MAP));
MRJobConfig.DEFAULT_MAP_MEMORY_MB));
assertEquals(expectedReduceMB, assertEquals(expectedReduceMB,
simulatedConf.getLong(MRJobConfig.REDUCE_MEMORY_MB, simulatedConf.getMemoryRequired(TaskType.REDUCE));
MRJobConfig.DEFAULT_MAP_MEMORY_MB));
} }
/** /**