From 5aab014340b53ebc9363ee244b2cbea7a4c1f573 Mon Sep 17 00:00:00 2001 From: Ravi Prakash Date: Fri, 8 May 2015 15:56:29 -0700 Subject: [PATCH] MAPREDUCE-4750. Enable NNBenchWithoutMR in MapredTestDriver (Liang Xie and Jason Lowe via raviprak) --- hadoop-mapreduce-project/CHANGES.txt | 4 +++- .../test/java/org/apache/hadoop/test/MapredTestDriver.java | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 45075459667..a09d25e10b1 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -328,7 +328,6 @@ Release 2.8.0 - UNRELEASED OPTIMIZATIONS BUG FIXES - MAPREDUCE-6314. TestPipeApplication fails on trunk. (Varun Vasudev via harsh) @@ -400,6 +399,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 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 b1dfe56dbf8..8fa82aabf17 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 @@ -35,6 +35,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; @@ -90,7 +91,9 @@ public class MapredTestDriver { pgd.addClass("sleep", SleepJob.class, "A job that sleeps at each map and reduce task."); 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,