hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zjs...@apache.org
Subject [35/50] [abbrv] hadoop git commit: MAPREDUCE-6234. TestHighRamJob fails due to the change in MAPREDUCE-5785. (Masatake Iwasaki via kasha)
Date Wed, 18 Feb 2015 21:19:33 GMT
MAPREDUCE-6234. TestHighRamJob fails due to the change in MAPREDUCE-5785. (Masatake Iwasaki
via kasha)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/409113d8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/409113d8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/409113d8

Branch: refs/heads/YARN-2928
Commit: 409113d8f97fcfdb96cb028dbb6a20c9a1df81b0
Parents: 043e44b
Author: Karthik Kambatla <kasha@apache.org>
Authored: Tue Feb 17 14:38:00 2015 -0800
Committer: Karthik Kambatla <kasha@apache.org>
Committed: Tue Feb 17 14:38:00 2015 -0800

----------------------------------------------------------------------
 hadoop-mapreduce-project/CHANGES.txt                     |  3 +++
 .../org/apache/hadoop/mapred/gridmix/TestHighRamJob.java | 11 +++++------
 2 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/409113d8/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index aebc71e..50e067c 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

http://git-wip-us.apache.org/repos/asf/hadoop/blob/409113d8/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestHighRamJob.java
----------------------------------------------------------------------
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 9cc84ea..179c941 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
+}


Mime
View raw message