Author: omalley Date: Fri Nov 13 21:37:54 2009 New Revision: 836005 URL: http://svn.apache.org/viewvc?rev=836005&view=rev Log: HDFS-641. Move all of the components that depend on map/reduce to map/reduce. (omalley) Added: hadoop/mapreduce/branches/branch-0.21/src/contrib/block_forensics/ (props changed) - copied from r835968, hadoop/mapreduce/trunk/src/contrib/block_forensics/ hadoop/mapreduce/branches/branch-0.21/src/contrib/block_forensics/README - copied unchanged from r835968, hadoop/mapreduce/trunk/src/contrib/block_forensics/README hadoop/mapreduce/branches/branch-0.21/src/contrib/block_forensics/build.xml - copied unchanged from r835968, hadoop/mapreduce/trunk/src/contrib/block_forensics/build.xml hadoop/mapreduce/branches/branch-0.21/src/contrib/block_forensics/client/ - copied from r835968, hadoop/mapreduce/trunk/src/contrib/block_forensics/client/ hadoop/mapreduce/branches/branch-0.21/src/contrib/block_forensics/client/BlockForensics.java - copied unchanged from r835968, hadoop/mapreduce/trunk/src/contrib/block_forensics/client/BlockForensics.java hadoop/mapreduce/branches/branch-0.21/src/contrib/block_forensics/ivy/ - copied from r835968, hadoop/mapreduce/trunk/src/contrib/block_forensics/ivy/ hadoop/mapreduce/branches/branch-0.21/src/contrib/block_forensics/ivy.xml - copied unchanged from r835968, hadoop/mapreduce/trunk/src/contrib/block_forensics/ivy.xml hadoop/mapreduce/branches/branch-0.21/src/contrib/block_forensics/ivy/libraries.properties - copied unchanged from r835968, hadoop/mapreduce/trunk/src/contrib/block_forensics/ivy/libraries.properties hadoop/mapreduce/branches/branch-0.21/src/contrib/block_forensics/src/ - copied from r835968, hadoop/mapreduce/trunk/src/contrib/block_forensics/src/ hadoop/mapreduce/branches/branch-0.21/src/contrib/block_forensics/src/java/ - copied from r835968, hadoop/mapreduce/trunk/src/contrib/block_forensics/src/java/ hadoop/mapreduce/branches/branch-0.21/src/contrib/block_forensics/src/java/org/ - copied from r835968, hadoop/mapreduce/trunk/src/contrib/block_forensics/src/java/org/ hadoop/mapreduce/branches/branch-0.21/src/contrib/block_forensics/src/java/org/apache/ - copied from r835968, hadoop/mapreduce/trunk/src/contrib/block_forensics/src/java/org/apache/ hadoop/mapreduce/branches/branch-0.21/src/contrib/block_forensics/src/java/org/apache/hadoop/ - copied from r835968, hadoop/mapreduce/trunk/src/contrib/block_forensics/src/java/org/apache/hadoop/ hadoop/mapreduce/branches/branch-0.21/src/contrib/block_forensics/src/java/org/apache/hadoop/block_forensics/ - copied from r835968, hadoop/mapreduce/trunk/src/contrib/block_forensics/src/java/org/apache/hadoop/block_forensics/ hadoop/mapreduce/branches/branch-0.21/src/contrib/block_forensics/src/java/org/apache/hadoop/block_forensics/BlockSearch.java - copied unchanged from r835968, hadoop/mapreduce/trunk/src/contrib/block_forensics/src/java/org/apache/hadoop/block_forensics/BlockSearch.java hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/fs/ (props changed) - copied from r835968, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/fs/ hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/fs/AccumulatingReducer.java - copied unchanged from r835968, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/fs/AccumulatingReducer.java hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/fs/DFSCIOTest.java - copied unchanged from r835968, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/fs/DFSCIOTest.java hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/fs/DistributedFSCheck.java - copied unchanged from r835968, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/fs/DistributedFSCheck.java hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/fs/IOMapperBase.java - copied unchanged from r835968, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/fs/IOMapperBase.java hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/fs/JHLogAnalyzer.java - copied unchanged from r835968, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/fs/JHLogAnalyzer.java hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/fs/TestDFSIO.java - copied unchanged from r835968, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/fs/TestDFSIO.java hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/fs/TestFileSystem.java - copied unchanged from r835968, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/fs/TestFileSystem.java hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/fs/TestJHLA.java - copied unchanged from r835968, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/fs/TestJHLA.java hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/hdfs/ (props changed) - copied from r835968, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/hdfs/ hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/hdfs/NNBench.java - copied unchanged from r835968, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/hdfs/NNBench.java hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/hdfs/NNBenchWithoutMR.java - copied unchanged from r835968, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/hdfs/NNBenchWithoutMR.java hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/io/FileBench.java - copied unchanged from r835968, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/io/FileBench.java hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java - copied unchanged from r835968, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java - copied unchanged from r835968, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java Modified: hadoop/mapreduce/branches/branch-0.21/ (props changed) hadoop/mapreduce/branches/branch-0.21/.gitignore (props changed) hadoop/mapreduce/branches/branch-0.21/CHANGES.txt (contents, props changed) hadoop/mapreduce/branches/branch-0.21/conf/ (props changed) hadoop/mapreduce/branches/branch-0.21/conf/capacity-scheduler.xml.template (props changed) hadoop/mapreduce/branches/branch-0.21/src/c++/ (props changed) hadoop/mapreduce/branches/branch-0.21/src/contrib/ (props changed) hadoop/mapreduce/branches/branch-0.21/src/contrib/build-contrib.xml (props changed) hadoop/mapreduce/branches/branch-0.21/src/contrib/build.xml (props changed) hadoop/mapreduce/branches/branch-0.21/src/contrib/capacity-scheduler/ (props changed) hadoop/mapreduce/branches/branch-0.21/src/contrib/data_join/ (props changed) hadoop/mapreduce/branches/branch-0.21/src/contrib/dynamic-scheduler/ (props changed) hadoop/mapreduce/branches/branch-0.21/src/contrib/eclipse-plugin/ (props changed) hadoop/mapreduce/branches/branch-0.21/src/contrib/fairscheduler/ (props changed) hadoop/mapreduce/branches/branch-0.21/src/contrib/index/ (props changed) hadoop/mapreduce/branches/branch-0.21/src/contrib/mrunit/ (props changed) hadoop/mapreduce/branches/branch-0.21/src/contrib/sqoop/ (props changed) hadoop/mapreduce/branches/branch-0.21/src/contrib/streaming/ (props changed) hadoop/mapreduce/branches/branch-0.21/src/contrib/vaidya/ (props changed) hadoop/mapreduce/branches/branch-0.21/src/examples/ (props changed) hadoop/mapreduce/branches/branch-0.21/src/java/ (props changed) hadoop/mapreduce/branches/branch-0.21/src/test/mapred/ (props changed) hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java (contents, props changed) hadoop/mapreduce/branches/branch-0.21/src/webapps/job/ (props changed) Propchange: hadoop/mapreduce/branches/branch-0.21/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 13 21:37:54 2009 @@ -1,2 +1,2 @@ /hadoop/core/branches/branch-0.19/mapred:713112 -/hadoop/mapreduce/trunk:818355,818918,818946,824750,828081 +/hadoop/mapreduce/trunk:818355,818918,818946,824750,828081,835968 Propchange: hadoop/mapreduce/branches/branch-0.21/.gitignore ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 13 21:37:54 2009 @@ -1,3 +1,3 @@ /hadoop/core/branches/branch-0.19/mapred/.gitignore:713112 /hadoop/core/trunk/.gitignore:784664-785643 -/hadoop/mapreduce/trunk/.gitignore:818355,818918,818946,824750,828081 +/hadoop/mapreduce/trunk/.gitignore:818355,818918,818946,824750,828081,835968 Modified: hadoop/mapreduce/branches/branch-0.21/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/CHANGES.txt?rev=836005&r1=836004&r2=836005&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/CHANGES.txt (original) +++ hadoop/mapreduce/branches/branch-0.21/CHANGES.txt Fri Nov 13 21:37:54 2009 @@ -425,6 +425,11 @@ MAPREDUCE-971. Document use of distcp when copying to s3, managing timeouts in particular. (Aaron Kimball via cdouglas) + HDFS-663. DFSIO for append. (shv) + + HDFS-641. Move all of the components that depend on map/reduce to + map/reduce. (omalley) + BUG FIXES MAPREDUCE-1089. Fix NPE in fair scheduler preemption when tasks are Propchange: hadoop/mapreduce/branches/branch-0.21/CHANGES.txt ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Nov 13 21:37:54 2009 @@ -0,0 +1,3 @@ +/hadoop/core/branches/branch-0.19/mapred/CHANGES.txt:713112 +/hadoop/mapreduce/branches/HDFS-641/CHANGES.txt:817878-835964 +/hadoop/mapreduce/trunk/CHANGES.txt:818355,818918,818946,824750,828081,835968 Propchange: hadoop/mapreduce/branches/branch-0.21/conf/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 13 21:37:54 2009 @@ -1,3 +1,3 @@ /hadoop/core/branches/branch-0.19/mapred/conf:713112 /hadoop/core/trunk/conf:784664-785643 -/hadoop/mapreduce/trunk/conf:818355,818918,818946,824750,828081 +/hadoop/mapreduce/trunk/conf:818355,818918,818946,824750,828081,835968 Propchange: hadoop/mapreduce/branches/branch-0.21/conf/capacity-scheduler.xml.template ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 13 21:37:54 2009 @@ -1,3 +1,3 @@ /hadoop/core/branches/branch-0.19/mapred/conf/capacity-scheduler.xml.template:713112 /hadoop/core/trunk/conf/capacity-scheduler.xml.template:776175-785643 -/hadoop/mapreduce/trunk/conf/capacity-scheduler.xml.template:818355,818918,818946,824750,828081 +/hadoop/mapreduce/trunk/conf/capacity-scheduler.xml.template:818355,818918,818946,824750,828081,835968 Propchange: hadoop/mapreduce/branches/branch-0.21/src/c++/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 13 21:37:54 2009 @@ -1,3 +1,3 @@ /hadoop/core/branches/branch-0.19/mapred/src/c++:713112 /hadoop/core/trunk/src/c++:776175-784663 -/hadoop/mapreduce/trunk/src/c++:818355,818918,818946,824750,828081 +/hadoop/mapreduce/trunk/src/c++:818355,818918,818946,824750,828081,835968 Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 13 21:37:54 2009 @@ -1,3 +1,3 @@ /hadoop/core/branches/branch-0.19/mapred/src/contrib:713112 /hadoop/core/trunk/src/contrib:784664-785643 -/hadoop/mapreduce/trunk/src/contrib:818355,818918,818946,824750,828081 +/hadoop/mapreduce/trunk/src/contrib:818355,818918,818946,824750,828081,835968 Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/block_forensics/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Nov 13 21:37:54 2009 @@ -0,0 +1,4 @@ +/hadoop/core/branches/branch-0.19/hdfs/src/contrib/block_forensics:713112 +/hadoop/core/branches/branch-0.19/mapred/src/contrib/block_forensics:713112 +/hadoop/core/trunk/src/contrib/block_forensics:784664-785643 +/hadoop/mapreduce/trunk/src/contrib/block_forensics:818355,818918,818946,824750,828081,835968 Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/build-contrib.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 13 21:37:54 2009 @@ -1,3 +1,3 @@ /hadoop/core/branches/branch-0.19/mapred/src/contrib/build-contrib.xml:713112 /hadoop/core/trunk/src/contrib/build-contrib.xml:776175-786373 -/hadoop/mapreduce/trunk/src/contrib/build-contrib.xml:818355,818918,818946,824750,828081 +/hadoop/mapreduce/trunk/src/contrib/build-contrib.xml:818355,818918,818946,824750,828081,835968 Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/build.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 13 21:37:54 2009 @@ -1,3 +1,3 @@ /hadoop/core/branches/branch-0.19/mapred/src/contrib/build.xml:713112 /hadoop/core/trunk/src/contrib/build.xml:776175-786373 -/hadoop/mapreduce/trunk/src/contrib/build.xml:818355,818918,818946,824750,828081 +/hadoop/mapreduce/trunk/src/contrib/build.xml:818355,818918,818946,824750,828081,835968 Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/capacity-scheduler/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 13 21:37:54 2009 @@ -1,3 +1,3 @@ /hadoop/core/branches/branch-0.19/mapred/src/contrib/capacity-scheduler:713112 /hadoop/core/trunk/src/contrib/capacity-scheduler:776175-786373 -/hadoop/mapreduce/trunk/src/contrib/capacity-scheduler:818355,818918,818946,824750,828081 +/hadoop/mapreduce/trunk/src/contrib/capacity-scheduler:818355,818918,818946,824750,828081,835968 Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/data_join/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 13 21:37:54 2009 @@ -1,3 +1,3 @@ /hadoop/core/branches/branch-0.19/mapred/src/contrib/data_join:713112 /hadoop/core/trunk/src/contrib/data_join:776175-786373 -/hadoop/mapreduce/trunk/src/contrib/data_join:818355,818918,818946,824750,828081 +/hadoop/mapreduce/trunk/src/contrib/data_join:818355,818918,818946,824750,828081,835968 Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/dynamic-scheduler/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 13 21:37:54 2009 @@ -1,3 +1,3 @@ /hadoop/core/branches/branch-0.19/src/contrib/dynamic-scheduler:713112 /hadoop/core/trunk/src/contrib/dynamic-scheduler:784975-786373 -/hadoop/mapreduce/trunk/src/contrib/dynamic-scheduler:818355,818918,818946,824750,828081 +/hadoop/mapreduce/trunk/src/contrib/dynamic-scheduler:818355,818918,818946,824750,828081,835968 Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/eclipse-plugin/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 13 21:37:54 2009 @@ -1,3 +1,3 @@ /hadoop/core/branches/branch-0.19/core/src/contrib/eclipse-plugin:713112 /hadoop/core/trunk/src/contrib/eclipse-plugin:776175-784663 -/hadoop/mapreduce/trunk/src/contrib/eclipse-plugin:818355,818918,818946,824750,828081 +/hadoop/mapreduce/trunk/src/contrib/eclipse-plugin:818355,818918,818946,824750,828081,835968 Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/fairscheduler/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 13 21:37:54 2009 @@ -1,3 +1,3 @@ /hadoop/core/branches/branch-0.19/mapred/src/contrib/fairscheduler:713112 /hadoop/core/trunk/src/contrib/fairscheduler:776175-786373 -/hadoop/mapreduce/trunk/src/contrib/fairscheduler:818355,818918,818946,824750,828081 +/hadoop/mapreduce/trunk/src/contrib/fairscheduler:818355,818918,818946,824750,828081,835968 Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/index/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 13 21:37:54 2009 @@ -1,3 +1,3 @@ /hadoop/core/branches/branch-0.19/mapred/src/contrib/index:713112 /hadoop/core/trunk/src/contrib/index:776175-786373 -/hadoop/mapreduce/trunk/src/contrib/index:818355,818918,818946,824750,828081 +/hadoop/mapreduce/trunk/src/contrib/index:818355,818918,818946,824750,828081,835968 Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/mrunit/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 13 21:37:54 2009 @@ -1,3 +1,3 @@ /hadoop/core/branches/branch-0.19/mapred/src/contrib/mrunit:713112 /hadoop/core/trunk/src/contrib/mrunit:776175-786373 -/hadoop/mapreduce/trunk/src/contrib/mrunit:818355,818918,818946,824750,828081 +/hadoop/mapreduce/trunk/src/contrib/mrunit:818355,818918,818946,824750,828081,835968 Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/sqoop/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 13 21:37:54 2009 @@ -1,3 +1,3 @@ /hadoop/core/branches/branch-0.19/src/contrib/sqoop:713112 /hadoop/core/trunk/src/contrib/sqoop:784975-786373 -/hadoop/mapreduce/trunk/src/contrib/sqoop:818355,818918,818946,824750,828081 +/hadoop/mapreduce/trunk/src/contrib/sqoop:818355,818918,818946,824750,828081,835968 Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/streaming/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 13 21:37:54 2009 @@ -1,3 +1,3 @@ /hadoop/core/branches/branch-0.19/mapred/src/contrib/streaming:713112 /hadoop/core/trunk/src/contrib/streaming:776175-786373 -/hadoop/mapreduce/trunk/src/contrib/streaming:818355,818918,818946,824750,828081 +/hadoop/mapreduce/trunk/src/contrib/streaming:818355,818918,818946,824750,828081,835968 Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/vaidya/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 13 21:37:54 2009 @@ -1,3 +1,3 @@ /hadoop/core/branches/branch-0.19/mapred/src/contrib/vaidya:713112 /hadoop/core/trunk/src/contrib/vaidya:776175-786373 -/hadoop/mapreduce/trunk/src/contrib/vaidya:818355,818918,818946,824750,828081 +/hadoop/mapreduce/trunk/src/contrib/vaidya:818355,818918,818946,824750,828081,835968 Propchange: hadoop/mapreduce/branches/branch-0.21/src/examples/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 13 21:37:54 2009 @@ -1,3 +1,3 @@ /hadoop/core/branches/branch-0.19/mapred/src/examples:713112 /hadoop/core/trunk/src/examples:776175-784663 -/hadoop/mapreduce/trunk/src/examples:818355,818918,818946,824750,828081 +/hadoop/mapreduce/trunk/src/examples:818355,818918,818946,824750,828081,835968 Propchange: hadoop/mapreduce/branches/branch-0.21/src/java/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 13 21:37:54 2009 @@ -1,3 +1,3 @@ /hadoop/core/branches/branch-0.19/mapred/src/java:713112 /hadoop/core/trunk/src/mapred:776175-785643 -/hadoop/mapreduce/trunk/src/java:818355,818918,818946,824750,828081 +/hadoop/mapreduce/trunk/src/java:818355,818918,818946,824750,828081,835968 Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 13 21:37:54 2009 @@ -1,3 +1,3 @@ /hadoop/core/branches/branch-0.19/mapred/src/test/mapred:713112 /hadoop/core/trunk/src/test/mapred:776175-785643 -/hadoop/mapreduce/trunk/src/test/mapred:818355,818918,818946,824750,828081 +/hadoop/mapreduce/trunk/src/test/mapred:818355,818918,818946,824750,828081,835968 Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/fs/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Nov 13 21:37:54 2009 @@ -0,0 +1,3 @@ +/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/fs:713112 +/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/fs:776175-785643 +/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/fs:817878-835934,835968 Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/hdfs/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Nov 13 21:37:54 2009 @@ -0,0 +1,3 @@ +/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/hdfs:713112 +/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/hdfs:776175-785643 +/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/hdfs:817878-835934,835968 Modified: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java?rev=836005&r1=836004&r2=836005&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java Fri Nov 13 21:37:54 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(); } Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Nov 13 21:37:54 2009 @@ -0,0 +1,3 @@ +/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java:713112 +/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java:776175-785643 +/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java:817878-835934,835968 Propchange: hadoop/mapreduce/branches/branch-0.21/src/webapps/job/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 13 21:37:54 2009 @@ -1,3 +1,3 @@ /hadoop/core/branches/branch-0.19/mapred/src/webapps/job:713112 /hadoop/core/trunk/src/webapps/job:776175-785643 -/hadoop/mapreduce/trunk/src/webapps/job:818355,818918,818946,824750,828081 +/hadoop/mapreduce/trunk/src/webapps/job:818355,818918,818946,824750,828081,835968