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 zj...@apache.org on 2015/05/09 02:42:37 UTC

[43/50] hadoop git commit: MAPREDUCE-4750. Enable NNBenchWithoutMR in MapredTestDriver (Liang Xie and Jason Lowe via raviprak)

MAPREDUCE-4750. Enable NNBenchWithoutMR in MapredTestDriver (Liang Xie and Jason Lowe via raviprak)


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

Branch: refs/heads/YARN-2928
Commit: be45c790ed5bf9d3bc382cc74d04f8212e55add4
Parents: 414c456
Author: Ravi Prakash <ra...@altiscale.com>
Authored: Fri May 8 15:56:29 2015 -0700
Committer: Zhijie Shen <zj...@apache.org>
Committed: Fri May 8 17:40:24 2015 -0700

----------------------------------------------------------------------
 hadoop-mapreduce-project/CHANGES.txt                            | 4 +++-
 .../src/test/java/org/apache/hadoop/test/MapredTestDriver.java  | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/be45c790/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index d3fcca6..3aed17d 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -346,7 +346,6 @@ Release 2.8.0 - UNRELEASED
   OPTIMIZATIONS
 
   BUG FIXES
-
     MAPREDUCE-6314. TestPipeApplication fails on trunk.
     (Varun Vasudev via harsh)
 
@@ -418,6 +417,9 @@ Release 2.8.0 - UNRELEASED
     MAPREDUCE-3383. Duplicate job.getOutputValueGroupingComparator() in
     ReduceTask (Binglin Chang via jlowe)
 
+    MAPREDUCE-4750. Enable NNBenchWithoutMR in MapredTestDriver (Liang Xie
+    and Jason Lowe via raviprak)
+
 Release 2.7.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/be45c790/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/test/MapredTestDriver.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/test/MapredTestDriver.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/test/MapredTestDriver.java
index 0ecfd8a..5dcb143 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/test/MapredTestDriver.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/test/MapredTestDriver.java
@@ -36,6 +36,7 @@ import org.apache.hadoop.mapreduce.SleepJob;
 import org.apache.hadoop.util.ProgramDriver;
 
 import org.apache.hadoop.hdfs.NNBench;
+import org.apache.hadoop.hdfs.NNBenchWithoutMR;
 import org.apache.hadoop.fs.TestFileSystem;
 import org.apache.hadoop.fs.TestDFSIO;
 import org.apache.hadoop.fs.DFSCIOTest;
@@ -93,7 +94,9 @@ public class MapredTestDriver {
       pgd.addClass("timelineperformance", TimelineServicePerformanceV2.class,
           "A job that launch mappers to test timline service performance.");
       pgd.addClass("nnbench", NNBench.class, 
-          "A benchmark that stresses the namenode.");
+          "A benchmark that stresses the namenode w/ MR.");
+      pgd.addClass("nnbenchWithoutMR", NNBenchWithoutMR.class,
+          "A benchmark that stresses the namenode w/o MR.");
       pgd.addClass("testfilesystem", TestFileSystem.class, 
           "A test for FileSystem read/write.");
       pgd.addClass(TestDFSIO.class.getSimpleName(), TestDFSIO.class,