hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rkan...@apache.org
Subject hadoop git commit: MAPREDUCE-6233. org.apache.hadoop.mapreduce.TestLargeSort.testLargeSort failed in trunk (zxu via rkanter)
Date Thu, 05 Feb 2015 22:35:33 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 eb927a1d6 -> 46a202722


MAPREDUCE-6233. org.apache.hadoop.mapreduce.TestLargeSort.testLargeSort failed in trunk (zxu
via rkanter)

(cherry picked from commit e2ee2ff7d7ca429487d7e3883daedffbb269ebd4)


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

Branch: refs/heads/branch-2
Commit: 46a20272269be88c14c1b0d4e1d6bc4efa991028
Parents: eb927a1
Author: Robert Kanter <rkanter@apache.org>
Authored: Thu Feb 5 14:20:28 2015 -0800
Committer: Robert Kanter <rkanter@apache.org>
Committed: Thu Feb 5 14:31:44 2015 -0800

----------------------------------------------------------------------
 hadoop-mapreduce-project/CHANGES.txt                              | 3 +++
 .../src/test/java/org/apache/hadoop/mapreduce/TestLargeSort.java  | 1 +
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/46a20272/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index b68e522..b8e46f4 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -109,6 +109,9 @@ Release 2.7.0 - UNRELEASED
     MAPREDUCE-6186. Redundant call to requireJob() while displaying the conf
     page (Rohit Agarwal via jlowe)
 
+    MAPREDUCE-6233. org.apache.hadoop.mapreduce.TestLargeSort.testLargeSort
+    failed in trunk (zxu via rkanter)
+
 Release 2.6.0 - 2014-11-18
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/46a20272/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestLargeSort.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestLargeSort.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestLargeSort.java
index ab99a2f..eb48d67 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestLargeSort.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestLargeSort.java
@@ -55,6 +55,7 @@ public class TestLargeSort {
     int[] ioSortMbs = {128, 256, 1536};
     for (int ioSortMb : ioSortMbs) {
       Configuration conf = new Configuration(cluster.getConfig());
+      conf.setInt(MRJobConfig.MAP_MEMORY_MB, 2048);
       conf.setInt(MRJobConfig.IO_SORT_MB, ioSortMb);
       conf.setInt(LargeSorter.NUM_MAP_TASKS, 1);
       conf.setInt(LargeSorter.MBS_PER_MAP, ioSortMb);


Mime
View raw message