big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MAPREDUCE-6204. TestJobCounters should use new properties instead of JobConf.MAPRED_TASK_JAVA_OPTS.

Browse Source
This commit is contained in:
Tsuyoshi Ozawa 2015-05-22 23:29:53 +09:00
parent 55ed6558ba
commit b27ce3c531
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -425,6 +425,9 @@ Release 2.8.0 - UNRELEASED
avoid FileNotFoundException causing HistoryFileInfo into MOVE_FAILED state. avoid FileNotFoundException causing HistoryFileInfo into MOVE_FAILED state.
(zhihai xu via devaraj) (zhihai xu via devaraj)
MAPREDUCE-6204. TestJobCounters should use new properties instead of
JobConf.MAPRED_TASK_JAVA_OPTS. (Sam Liu via ozawa)
Release 2.7.1 - UNRELEASED Release 2.7.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

5
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobCounters.java
View File

@ -611,8 +611,9 @@ private static RunningJob runHeapUsageTestJob(JobConf conf, Path testRootDir,
jobConf.setOutputValueClass(Text.class); jobConf.setOutputValueClass(Text.class);
jobConf.setMaxMapAttempts(1); jobConf.setMaxMapAttempts(1);
jobConf.setMaxReduceAttempts(1); jobConf.setMaxReduceAttempts(1);
jobConf.set(JobConf.MAPRED_TASK_JAVA_OPTS, heapOptions); jobConf.set(JobConf.MAPRED_MAP_TASK_JAVA_OPTS, heapOptions);
jobConf.set(JobConf.MAPRED_REDUCE_TASK_JAVA_OPTS, heapOptions);
// set the targets // set the targets
jobConf.setLong(MemoryLoaderMapper.TARGET_VALUE, targetMapValue); jobConf.setLong(MemoryLoaderMapper.TARGET_VALUE, targetMapValue);
jobConf.setLong(MemoryLoaderReducer.TARGET_VALUE, targetReduceValue); jobConf.setLong(MemoryLoaderReducer.TARGET_VALUE, targetReduceValue);