You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ar...@apache.org on 2014/08/23 09:49:43 UTC
svn commit: r1619980 - in /hadoop/common/branches/HDFS-6581: ./
hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestHighRamJob.java
Author: arp
Date: Sat Aug 23 07:49:41 2014
New Revision: 1619980
URL: http://svn.apache.org/r1619980
Log:
Merging r1619458 through r1619979 from trunk to branch HDFS-6581
Modified:
hadoop/common/branches/HDFS-6581/ (props changed)
hadoop/common/branches/HDFS-6581/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestHighRamJob.java
Propchange: hadoop/common/branches/HDFS-6581/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1619458-1619979
Modified: hadoop/common/branches/HDFS-6581/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestHighRamJob.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-6581/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestHighRamJob.java?rev=1619980&r1=1619979&r2=1619980&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-6581/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestHighRamJob.java (original)
+++ hadoop/common/branches/HDFS-6581/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestHighRamJob.java Sat Aug 23 07:49:41 2014
@@ -97,10 +97,10 @@ public class TestHighRamJob {
// check if the high ram properties are not set
assertEquals(expectedMapMB,
simulatedConf.getLong(MRJobConfig.MAP_MEMORY_MB,
- JobConf.DISABLED_MEMORY_LIMIT));
+ MRJobConfig.DEFAULT_MAP_MEMORY_MB));
assertEquals(expectedReduceMB,
simulatedConf.getLong(MRJobConfig.REDUCE_MEMORY_MB,
- JobConf.DISABLED_MEMORY_LIMIT));
+ MRJobConfig.DEFAULT_MAP_MEMORY_MB));
}
/**
@@ -114,10 +114,10 @@ public class TestHighRamJob {
// test : check high ram emulation disabled
gridmixConf.setBoolean(GridmixJob.GRIDMIX_HIGHRAM_EMULATION_ENABLE, false);
- testHighRamConfig(10, 20, 5, 10, JobConf.DISABLED_MEMORY_LIMIT,
- JobConf.DISABLED_MEMORY_LIMIT,
- JobConf.DISABLED_MEMORY_LIMIT,
- JobConf.DISABLED_MEMORY_LIMIT, gridmixConf);
+ testHighRamConfig(10, 20, 5, 10, MRJobConfig.DEFAULT_MAP_MEMORY_MB,
+ MRJobConfig.DEFAULT_REDUCE_MEMORY_MB,
+ MRJobConfig.DEFAULT_MAP_MEMORY_MB,
+ MRJobConfig.DEFAULT_REDUCE_MEMORY_MB, gridmixConf);
// test : check with high ram enabled (default) and no scaling
gridmixConf = new Configuration();