From 6042b53a744db3e202dd9a16800247d19242156c Mon Sep 17 00:00:00 2001 From: Tsuyoshi Ozawa Date: Fri, 22 May 2015 23:29:53 +0900 Subject: [PATCH] MAPREDUCE-6204. TestJobCounters should use new properties instead of JobConf.MAPRED_TASK_JAVA_OPTS. (cherry picked from commit b27ce3c5318a40bc79565783961f6675dcdcb14a) --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../test/java/org/apache/hadoop/mapred/TestJobCounters.java | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 8505841a480..7d221a470e2 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -167,6 +167,9 @@ Release 2.8.0 - UNRELEASED avoid FileNotFoundException causing HistoryFileInfo into MOVE_FAILED state. (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 INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobCounters.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobCounters.java index 1185ffb7c3a..8b692cafc5e 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobCounters.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobCounters.java @@ -611,8 +611,9 @@ public class TestJobCounters { jobConf.setOutputValueClass(Text.class); jobConf.setMaxMapAttempts(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 jobConf.setLong(MemoryLoaderMapper.TARGET_VALUE, targetMapValue); jobConf.setLong(MemoryLoaderReducer.TARGET_VALUE, targetReduceValue);