Return-Path: Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Received: (qmail 28725 invoked from network); 24 Sep 2009 17:32:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 24 Sep 2009 17:32:46 -0000 Received: (qmail 983 invoked by uid 500); 24 Sep 2009 17:32:46 -0000 Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org Received: (qmail 950 invoked by uid 500); 24 Sep 2009 17:32:45 -0000 Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: mapreduce-dev@hadoop.apache.org Delivered-To: mailing list mapreduce-commits@hadoop.apache.org Received: (qmail 939 invoked by uid 99); 24 Sep 2009 17:32:45 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Sep 2009 17:32:45 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Sep 2009 17:32:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7CDCC2388897; Thu, 24 Sep 2009 17:32:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r818559 - in /hadoop/mapreduce/branches/HDFS-641/src/test: hdfs-with-mr/ mapred/org/apache/hadoop/ mapred/org/apache/hadoop/fs/ mapred/org/apache/hadoop/hdfs/ mapred/org/apache/hadoop/io/ mapred/org/apache/hadoop/security/authorize/authoriz... Date: Thu, 24 Sep 2009 17:32:21 -0000 To: mapreduce-commits@hadoop.apache.org From: omalley@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090924173221.7CDCC2388897@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: omalley Date: Thu Sep 24 17:32:19 2009 New Revision: 818559 URL: http://svn.apache.org/viewvc?rev=818559&view=rev Log: HDFS-641. Fix locations of the files. Added: hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/fs/ - copied from r817893, hadoop/mapreduce/branches/HDFS-641/src/test/hdfs-with-mr/org/apache/hadoop/fs/ hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/hdfs/ hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/hdfs/NNBench.java - copied unchanged from r817893, hadoop/mapreduce/branches/HDFS-641/src/test/hdfs-with-mr/org/apache/hadoop/hdfs/NNBench.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/hdfs/NNBenchWithoutMR.java - copied unchanged from r817893, hadoop/mapreduce/branches/HDFS-641/src/test/hdfs-with-mr/org/apache/hadoop/hdfs/NNBenchWithoutMR.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/io/FileBench.java - copied unchanged from r817893, hadoop/mapreduce/branches/HDFS-641/src/test/hdfs-with-mr/org/apache/hadoop/io/FileBench.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java - copied unchanged from r817893, hadoop/mapreduce/branches/HDFS-641/src/test/hdfs-with-mr/org/apache/hadoop/io/TestSequenceFileMergeProgress.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/ipc - copied unchanged from r817893, hadoop/mapreduce/branches/HDFS-641/src/test/hdfs-with-mr/org/apache/hadoop/ipc/TestSocketFactory.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/security/authorize/authorize/ - copied from r817893, hadoop/mapreduce/branches/HDFS-641/src/test/hdfs-with-mr/org/apache/hadoop/security/authorize/ Removed: hadoop/mapreduce/branches/HDFS-641/src/test/hdfs-with-mr/ Modified: hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java Modified: hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java?rev=818559&r1=818558&r2=818559&view=diff ============================================================================== --- hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java (original) +++ hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java Thu Sep 24 17:32:19 2009 @@ -32,6 +32,14 @@ import org.apache.hadoop.mapreduce.SleepJob; import org.apache.hadoop.util.ProgramDriver; +import org.apache.hadoop.hdfs.NNBench; +import org.apache.hadoop.fs.TestFileSystem; +import org.apache.hadoop.fs.TestDFSIO; +import org.apache.hadoop.fs.DFSCIOTest; +import org.apache.hadoop.fs.DistributedFSCheck; +import org.apache.hadoop.io.FileBench; +import org.apache.hadoop.fs.JHLogAnalyzer; + /** * Driver for Map-reduce tests. * @@ -72,7 +80,24 @@ "A program that tests the reliability of the MR framework by " + "injecting faults/failures"); pgd.addClass("fail", FailJob.class, "a job that always fails"); - pgd.addClass("sleep", SleepJob.class, "A job that sleeps at each map and reduce task."); + 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."); + pgd.addClass("testfilesystem", TestFileSystem.class, + "A test for FileSystem read/write."); + pgd.addClass("TestDFSIO", TestDFSIO.class, + "Distributed i/o benchmark."); + pgd.addClass("DFSCIOTest", DFSCIOTest.class, "" + + "Distributed i/o benchmark of libhdfs."); + pgd.addClass("DistributedFSCheck", DistributedFSCheck.class, + "Distributed checkup of the file system consistency."); + pgd.addClass("filebench", FileBench.class, + "Benchmark SequenceFile(Input|Output)Format " + + "(block,record compressed and uncompressed), " + + "Text(Input|Output)Format (compressed and uncompressed)"); + pgd.addClass(JHLogAnalyzer.class.getSimpleName(), JHLogAnalyzer.class, + "Job History Log analyzer."); } catch(Throwable e) { e.printStackTrace(); }