From dcf84707ab50662add112bd6b01c0bfd63374853 Mon Sep 17 00:00:00 2001 From: Thomas Graves Date: Thu, 17 May 2012 15:06:33 +0000 Subject: [PATCH] MAPREDUCE-3543. Mavenize Gridmix. (tgraves) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1339629 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 2 + hadoop-project/pom.xml | 5 + hadoop-tools/hadoop-gridmix/pom.xml | 131 ++++++++++++++++++ .../mapred/gridmix/AvgRecordFactory.java | 0 .../mapred/gridmix/ClusterSummarizer.java | 3 +- .../gridmix/CompressionEmulationUtil.java | 0 .../gridmix/DistributedCacheEmulator.java | 0 .../mapred/gridmix/EchoUserResolver.java | 0 .../mapred/gridmix/ExecutionSummarizer.java | 0 .../hadoop/mapred/gridmix/FilePool.java | 0 .../hadoop/mapred/gridmix/FileQueue.java | 0 .../hadoop/mapred/gridmix/GenerateData.java | 0 .../mapred/gridmix/GenerateDistCacheData.java | 0 .../apache/hadoop/mapred/gridmix/Gridmix.java | 0 .../hadoop/mapred/gridmix/GridmixJob.java | 0 .../gridmix/GridmixJobSubmissionPolicy.java | 0 .../hadoop/mapred/gridmix/GridmixKey.java | 0 .../hadoop/mapred/gridmix/GridmixRecord.java | 0 .../hadoop/mapred/gridmix/GridmixSplit.java | 0 .../hadoop/mapred/gridmix/InputStriper.java | 0 .../gridmix/IntermediateRecordFactory.java | 0 .../hadoop/mapred/gridmix/JobCreator.java | 0 .../hadoop/mapred/gridmix/JobFactory.java | 0 .../hadoop/mapred/gridmix/JobMonitor.java | 0 .../hadoop/mapred/gridmix/JobSubmitter.java | 0 .../apache/hadoop/mapred/gridmix/LoadJob.java | 0 .../hadoop/mapred/gridmix/LoadSplit.java | 0 .../hadoop/mapred/gridmix/Progressive.java | 0 .../hadoop/mapred/gridmix/PseudoLocalFs.java | 0 .../mapred/gridmix/RandomAlgorithms.java | 0 .../gridmix/RandomTextDataGenerator.java | 0 .../mapred/gridmix/ReadRecordFactory.java | 0 .../hadoop/mapred/gridmix/RecordFactory.java | 0 .../mapred/gridmix/ReplayJobFactory.java | 0 .../gridmix/RoundRobinUserResolver.java | 0 .../mapred/gridmix/SerialJobFactory.java | 0 .../hadoop/mapred/gridmix/SleepJob.java | 0 .../hadoop/mapred/gridmix/StatListener.java | 0 .../hadoop/mapred/gridmix/Statistics.java | 0 .../mapred/gridmix/StressJobFactory.java | 0 .../mapred/gridmix/SubmitterUserResolver.java | 0 .../hadoop/mapred/gridmix/Summarizer.java | 0 .../hadoop/mapred/gridmix/UserResolver.java | 0 .../CumulativeCpuUsageEmulatorPlugin.java | 0 .../ResourceUsageEmulatorPlugin.java | 0 .../resourceusage/ResourceUsageMatcher.java | 0 .../TotalHeapUsageEmulatorPlugin.java | 0 .../mapred/gridmix/DebugJobFactory.java | 0 .../mapred/gridmix/DebugJobProducer.java | 0 .../mapred/gridmix/GridmixTestUtils.java | 9 +- .../TestCompressionEmulationUtils.java | 0 .../hadoop/mapred/gridmix/TestFilePool.java | 0 .../hadoop/mapred/gridmix/TestFileQueue.java | 0 .../gridmix/TestGridmixMemoryEmulation.java | 0 .../mapred/gridmix/TestGridmixRecord.java | 0 .../mapred/gridmix/TestGridmixSummary.java | 0 .../hadoop/mapred/gridmix/TestHighRamJob.java | 0 .../mapred/gridmix/TestPseudoLocalFs.java | 0 .../mapred/gridmix/TestRandomAlgorithm.java | 0 .../gridmix/TestRandomTextDataGenerator.java | 0 .../mapred/gridmix/TestRecordFactory.java | 0 .../gridmix/TestResourceUsageEmulators.java | 0 .../mapred/gridmix/TestUserResolve.java | 0 .../test/resources}/data/wordcount.json.gz | Bin hadoop-tools/hadoop-tools-dist/pom.xml | 5 + hadoop-tools/pom.xml | 1 + 66 files changed, 150 insertions(+), 6 deletions(-) create mode 100644 hadoop-tools/hadoop-gridmix/pom.xml rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/AvgRecordFactory.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/ClusterSummarizer.java (98%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/CompressionEmulationUtil.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/DistributedCacheEmulator.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/EchoUserResolver.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/ExecutionSummarizer.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/FilePool.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/FileQueue.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/GenerateData.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/GenerateDistCacheData.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/Gridmix.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/GridmixJob.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/GridmixJobSubmissionPolicy.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/GridmixKey.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/GridmixRecord.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/GridmixSplit.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/InputStriper.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/IntermediateRecordFactory.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/JobCreator.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/JobFactory.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/JobMonitor.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/JobSubmitter.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/LoadJob.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/LoadSplit.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/Progressive.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/PseudoLocalFs.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/RandomAlgorithms.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/RandomTextDataGenerator.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/ReadRecordFactory.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/RecordFactory.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/ReplayJobFactory.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/RoundRobinUserResolver.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/SerialJobFactory.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/SleepJob.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/StatListener.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/Statistics.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/StressJobFactory.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/SubmitterUserResolver.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/Summarizer.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/UserResolver.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/CumulativeCpuUsageEmulatorPlugin.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/ResourceUsageEmulatorPlugin.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/ResourceUsageMatcher.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src => hadoop-tools/hadoop-gridmix/src/main}/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/TotalHeapUsageEmulatorPlugin.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src/test => hadoop-tools/hadoop-gridmix/src/test/java}/org/apache/hadoop/mapred/gridmix/DebugJobFactory.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src/test => hadoop-tools/hadoop-gridmix/src/test/java}/org/apache/hadoop/mapred/gridmix/DebugJobProducer.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src/test => hadoop-tools/hadoop-gridmix/src/test/java}/org/apache/hadoop/mapred/gridmix/GridmixTestUtils.java (91%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src/test => hadoop-tools/hadoop-gridmix/src/test/java}/org/apache/hadoop/mapred/gridmix/TestCompressionEmulationUtils.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src/test => hadoop-tools/hadoop-gridmix/src/test/java}/org/apache/hadoop/mapred/gridmix/TestFilePool.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src/test => hadoop-tools/hadoop-gridmix/src/test/java}/org/apache/hadoop/mapred/gridmix/TestFileQueue.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src/test => hadoop-tools/hadoop-gridmix/src/test/java}/org/apache/hadoop/mapred/gridmix/TestGridmixMemoryEmulation.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src/test => hadoop-tools/hadoop-gridmix/src/test/java}/org/apache/hadoop/mapred/gridmix/TestGridmixRecord.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src/test => hadoop-tools/hadoop-gridmix/src/test/java}/org/apache/hadoop/mapred/gridmix/TestGridmixSummary.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src/test => hadoop-tools/hadoop-gridmix/src/test/java}/org/apache/hadoop/mapred/gridmix/TestHighRamJob.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src/test => hadoop-tools/hadoop-gridmix/src/test/java}/org/apache/hadoop/mapred/gridmix/TestPseudoLocalFs.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src/test => hadoop-tools/hadoop-gridmix/src/test/java}/org/apache/hadoop/mapred/gridmix/TestRandomAlgorithm.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src/test => hadoop-tools/hadoop-gridmix/src/test/java}/org/apache/hadoop/mapred/gridmix/TestRandomTextDataGenerator.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src/test => hadoop-tools/hadoop-gridmix/src/test/java}/org/apache/hadoop/mapred/gridmix/TestRecordFactory.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src/test => hadoop-tools/hadoop-gridmix/src/test/java}/org/apache/hadoop/mapred/gridmix/TestResourceUsageEmulators.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src/test => hadoop-tools/hadoop-gridmix/src/test/java}/org/apache/hadoop/mapred/gridmix/TestUserResolve.java (100%) rename {hadoop-mapreduce-project/src/contrib/gridmix/src/test => hadoop-tools/hadoop-gridmix/src/test/resources}/data/wordcount.json.gz (100%) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 8180d24d69c..7b241afba82 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -503,6 +503,8 @@ Release 0.23.3 - UNRELEASED MAPREDUCE-4102. job counters not available in Jobhistory webui for killed jobs (Bhallamudi Venkata Siva Kamesh via tgraves) + MAPREDUCE-3543. Mavenize Gridmix. (tgraves) + Release 0.23.2 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 8fc964b7851..3417fa791d0 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -212,6 +212,11 @@ hadoop-mapreduce-examples ${project.version} + + org.apache.hadoop + hadoop-gridmix + ${project.version} + org.apache.hadoop diff --git a/hadoop-tools/hadoop-gridmix/pom.xml b/hadoop-tools/hadoop-gridmix/pom.xml new file mode 100644 index 00000000000..95378834640 --- /dev/null +++ b/hadoop-tools/hadoop-gridmix/pom.xml @@ -0,0 +1,131 @@ + + + + 4.0.0 + + org.apache.hadoop + hadoop-project + 3.0.0-SNAPSHOT + ../../hadoop-project + + org.apache.hadoop + hadoop-gridmix + 3.0.0-SNAPSHOT + Apache Hadoop Gridmix + Apache Hadoop Gridmix + jar + + + ${project.build.directory}/log + + + + + org.apache.hadoop + hadoop-annotations + provided + + + org.apache.hadoop + hadoop-mapreduce-client-hs + test + + + org.apache.hadoop + hadoop-mapreduce-client-core + provided + + + org.apache.hadoop + hadoop-mapreduce-client-jobclient + provided + + + org.apache.hadoop + hadoop-mapreduce-client-jobclient + test + test-jar + + + org.apache.hadoop + hadoop-common + provided + + + org.apache.hadoop + hadoop-rumen + provided + + + org.apache.hadoop + hadoop-hdfs + provided + + + org.apache.hadoop + hadoop-common + test + test-jar + + + org.apache.hadoop + hadoop-hdfs + test + test-jar + + + org.apache.hadoop + hadoop-yarn-server-tests + test-jar + test + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + create-log-dir + process-test-resources + + run + + + + + + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + org.apache.hadoop.tools.HadoopArchives + + + + + + + diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/AvgRecordFactory.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/AvgRecordFactory.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/AvgRecordFactory.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/AvgRecordFactory.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/ClusterSummarizer.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ClusterSummarizer.java similarity index 98% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/ClusterSummarizer.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ClusterSummarizer.java index 341767c4b59..95681712198 100644 --- a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/ClusterSummarizer.java +++ b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ClusterSummarizer.java @@ -23,7 +23,6 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeys; import org.apache.hadoop.fs.FileSystem; -import org.apache.hadoop.mapred.JobTracker; import org.apache.hadoop.mapred.gridmix.Statistics.ClusterStats; import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig; @@ -114,4 +113,4 @@ class ClusterSummarizer implements StatListener { protected String getNamenodeInfo() { return namenodeInfo; } -} \ No newline at end of file +} diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/CompressionEmulationUtil.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/CompressionEmulationUtil.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/CompressionEmulationUtil.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/CompressionEmulationUtil.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/DistributedCacheEmulator.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/DistributedCacheEmulator.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/DistributedCacheEmulator.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/DistributedCacheEmulator.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/EchoUserResolver.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/EchoUserResolver.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/EchoUserResolver.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/EchoUserResolver.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/ExecutionSummarizer.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ExecutionSummarizer.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/ExecutionSummarizer.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ExecutionSummarizer.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/FilePool.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/FilePool.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/FilePool.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/FilePool.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/FileQueue.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/FileQueue.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/FileQueue.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/FileQueue.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GenerateData.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GenerateData.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GenerateData.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GenerateData.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GenerateDistCacheData.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GenerateDistCacheData.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GenerateDistCacheData.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GenerateDistCacheData.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Gridmix.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Gridmix.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Gridmix.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Gridmix.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GridmixJob.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixJob.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GridmixJob.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixJob.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GridmixJobSubmissionPolicy.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixJobSubmissionPolicy.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GridmixJobSubmissionPolicy.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixJobSubmissionPolicy.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GridmixKey.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixKey.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GridmixKey.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixKey.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GridmixRecord.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixRecord.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GridmixRecord.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixRecord.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GridmixSplit.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixSplit.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GridmixSplit.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixSplit.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/InputStriper.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/InputStriper.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/InputStriper.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/InputStriper.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/IntermediateRecordFactory.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/IntermediateRecordFactory.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/IntermediateRecordFactory.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/IntermediateRecordFactory.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobCreator.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobCreator.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobFactory.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobFactory.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobFactory.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobFactory.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobMonitor.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobMonitor.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobMonitor.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobMonitor.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobSubmitter.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobSubmitter.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobSubmitter.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobSubmitter.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/LoadJob.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/LoadJob.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/LoadJob.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/LoadJob.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/LoadSplit.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/LoadSplit.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/LoadSplit.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/LoadSplit.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Progressive.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Progressive.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Progressive.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Progressive.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/PseudoLocalFs.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/PseudoLocalFs.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/PseudoLocalFs.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/PseudoLocalFs.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/RandomAlgorithms.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RandomAlgorithms.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/RandomAlgorithms.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RandomAlgorithms.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/RandomTextDataGenerator.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RandomTextDataGenerator.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/RandomTextDataGenerator.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RandomTextDataGenerator.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/ReadRecordFactory.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ReadRecordFactory.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/ReadRecordFactory.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ReadRecordFactory.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/RecordFactory.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RecordFactory.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/RecordFactory.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RecordFactory.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/ReplayJobFactory.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ReplayJobFactory.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/ReplayJobFactory.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ReplayJobFactory.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/RoundRobinUserResolver.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RoundRobinUserResolver.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/RoundRobinUserResolver.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RoundRobinUserResolver.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/SerialJobFactory.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SerialJobFactory.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/SerialJobFactory.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SerialJobFactory.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/SleepJob.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SleepJob.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/SleepJob.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SleepJob.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/StatListener.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/StatListener.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/StatListener.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/StatListener.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Statistics.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Statistics.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Statistics.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Statistics.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/StressJobFactory.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/StressJobFactory.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/StressJobFactory.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/StressJobFactory.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/SubmitterUserResolver.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SubmitterUserResolver.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/SubmitterUserResolver.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SubmitterUserResolver.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Summarizer.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Summarizer.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Summarizer.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Summarizer.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/UserResolver.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/UserResolver.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/UserResolver.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/UserResolver.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/CumulativeCpuUsageEmulatorPlugin.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/CumulativeCpuUsageEmulatorPlugin.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/CumulativeCpuUsageEmulatorPlugin.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/CumulativeCpuUsageEmulatorPlugin.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/ResourceUsageEmulatorPlugin.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/ResourceUsageEmulatorPlugin.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/ResourceUsageEmulatorPlugin.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/ResourceUsageEmulatorPlugin.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/ResourceUsageMatcher.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/ResourceUsageMatcher.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/ResourceUsageMatcher.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/ResourceUsageMatcher.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/TotalHeapUsageEmulatorPlugin.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/TotalHeapUsageEmulatorPlugin.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/TotalHeapUsageEmulatorPlugin.java rename to hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/TotalHeapUsageEmulatorPlugin.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/DebugJobFactory.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DebugJobFactory.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/DebugJobFactory.java rename to hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DebugJobFactory.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/DebugJobProducer.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DebugJobProducer.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/DebugJobProducer.java rename to hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DebugJobProducer.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/GridmixTestUtils.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/GridmixTestUtils.java similarity index 91% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/GridmixTestUtils.java rename to hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/GridmixTestUtils.java index 8b727d2b49e..49f17097fed 100644 --- a/hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/GridmixTestUtils.java +++ b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/GridmixTestUtils.java @@ -1,5 +1,7 @@ package org.apache.hadoop.mapred.gridmix; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.CommonConfigurationKeys; @@ -32,6 +34,7 @@ import java.io.IOException; * limitations under the License. */ public class GridmixTestUtils { + private static final Log LOG = LogFactory.getLog(GridmixTestUtils.class); static final Path DEST = new Path("/gridmix"); static FileSystem dfs = null; static MiniDFSCluster dfsCluster = null; @@ -69,15 +72,13 @@ public class GridmixTestUtils { if(fs.exists(homeDirectory)) { fs.delete(homeDirectory,true); } - TestGridmixSubmission.LOG.info( - "Creating Home directory : " + homeDirectory); + LOG.info("Creating Home directory : " + homeDirectory); fs.mkdirs(homeDirectory); changePermission(user,homeDirectory, fs); Path stagingArea = new Path(conf.get("mapreduce.jobtracker.staging.root.dir", "/tmp/hadoop/mapred/staging")); - TestGridmixSubmission.LOG.info( - "Creating Staging root directory : " + stagingArea); + LOG.info("Creating Staging root directory : " + stagingArea); fs.mkdirs(stagingArea); fs.setPermission(stagingArea, new FsPermission((short) 0777)); } catch (IOException ioe) { diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestCompressionEmulationUtils.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestCompressionEmulationUtils.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestCompressionEmulationUtils.java rename to hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestCompressionEmulationUtils.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestFilePool.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestFilePool.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestFilePool.java rename to hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestFilePool.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestFileQueue.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestFileQueue.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestFileQueue.java rename to hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestFileQueue.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestGridmixMemoryEmulation.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixMemoryEmulation.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestGridmixMemoryEmulation.java rename to hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixMemoryEmulation.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestGridmixRecord.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixRecord.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestGridmixRecord.java rename to hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixRecord.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestGridmixSummary.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixSummary.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestGridmixSummary.java rename to hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixSummary.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestHighRamJob.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestHighRamJob.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestHighRamJob.java rename to hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestHighRamJob.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestPseudoLocalFs.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestPseudoLocalFs.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestPseudoLocalFs.java rename to hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestPseudoLocalFs.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestRandomAlgorithm.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestRandomAlgorithm.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestRandomAlgorithm.java rename to hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestRandomAlgorithm.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestRandomTextDataGenerator.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestRandomTextDataGenerator.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestRandomTextDataGenerator.java rename to hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestRandomTextDataGenerator.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestRecordFactory.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestRecordFactory.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestRecordFactory.java rename to hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestRecordFactory.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestResourceUsageEmulators.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestResourceUsageEmulators.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestResourceUsageEmulators.java rename to hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestResourceUsageEmulators.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestUserResolve.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestUserResolve.java similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestUserResolve.java rename to hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestUserResolve.java diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/test/data/wordcount.json.gz b/hadoop-tools/hadoop-gridmix/src/test/resources/data/wordcount.json.gz similarity index 100% rename from hadoop-mapreduce-project/src/contrib/gridmix/src/test/data/wordcount.json.gz rename to hadoop-tools/hadoop-gridmix/src/test/resources/data/wordcount.json.gz diff --git a/hadoop-tools/hadoop-tools-dist/pom.xml b/hadoop-tools/hadoop-tools-dist/pom.xml index 792f1e6e30d..04a0b55aba2 100644 --- a/hadoop-tools/hadoop-tools-dist/pom.xml +++ b/hadoop-tools/hadoop-tools-dist/pom.xml @@ -62,6 +62,11 @@ hadoop-extras compile + + org.apache.hadoop + hadoop-gridmix + compile + diff --git a/hadoop-tools/pom.xml b/hadoop-tools/pom.xml index 51013550e5c..190ea9cdb39 100644 --- a/hadoop-tools/pom.xml +++ b/hadoop-tools/pom.xml @@ -32,6 +32,7 @@ hadoop-distcp hadoop-archives hadoop-rumen + hadoop-gridmix hadoop-datajoin hadoop-tools-dist hadoop-extras