hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oz...@apache.org
Subject hadoop git commit: MAPREDUCE-6204. TestJobCounters should use new properties instead of JobConf.MAPRED_TASK_JAVA_OPTS.
Date Fri, 22 May 2015 14:30:53 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 19895a41a -> 6042b53a7


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

(cherry picked from commit b27ce3c5318a40bc79565783961f6675dcdcb14a)


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

Branch: refs/heads/branch-2
Commit: 6042b53a744db3e202dd9a16800247d19242156c
Parents: 19895a4
Author: Tsuyoshi Ozawa <ozawa@apache.org>
Authored: Fri May 22 23:29:53 2015 +0900
Committer: Tsuyoshi Ozawa <ozawa@apache.org>
Committed: Fri May 22 23:30:12 2015 +0900

----------------------------------------------------------------------
 hadoop-mapreduce-project/CHANGES.txt                            | 3 +++
 .../src/test/java/org/apache/hadoop/mapred/TestJobCounters.java | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/6042b53a/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 8505841..7d221a4 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

http://git-wip-us.apache.org/repos/asf/hadoop/blob/6042b53a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobCounters.java
----------------------------------------------------------------------
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 1185ffb..8b692ca 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);


Mime
View raw message