From 72900de5f456886f1223ef93e149bc178185e8f2 Mon Sep 17 00:00:00 2001
From: Erik Krogen <xkrogen@apache.org>
Date: Tue, 9 Jul 2019 12:47:22 -0700
Subject: [PATCH] HDFS-14639. [Dynamometer] Remove unnecessary duplicate
 directory from the distribution. Contributed by Erik Krogen.

---
 .../resources/assemblies/hadoop-tools.xml     | 22 -------------------
 hadoop-dist/pom.xml                           |  1 -
 2 files changed, 23 deletions(-)

diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
index 00f3b6670a..054d8c0ace 100644
--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
@@ -174,28 +174,6 @@
       <directory>../hadoop-sls/target/hadoop-sls-${project.version}/sls</directory>
       <outputDirectory>/share/hadoop/${hadoop.component}/sls</outputDirectory>
     </fileSet>
-    <fileSet>
-    <directory>../hadoop-dynamometer/hadoop-dynamometer-blockgen/target</directory>
-    <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
-    <includes>
-    <include>*-sources.jar</include>
-    </includes>
-    </fileSet>
-    <fileSet>
-    <directory>../hadoop-dynamometer/hadoop-dynamometer-blockgen/target/hadoop-dynamometer-blockgen-${project.version}/dynamometer-blockgen</directory>
-    <outputDirectory>/share/hadoop/${hadoop.component}/dynamometer-blockgen</outputDirectory>
-    </fileSet>
-    <!--<fileSet>-->
-      <!--<directory>../hadoop-dynamometer/hadoop-dynamometer-blockgen/target</directory>-->
-      <!--<outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>-->
-      <!--<includes>-->
-        <!--<include>*-sources.jar</include>-->
-      <!--</includes>-->
-    <!--</fileSet>-->
-    <!--<fileSet>-->
-      <!--<directory>../hadoop-dynamometer/hadoop-dynamometer-blockgen/target/hadoop-dynamometer-blockgen-${project.version}/dynamometer-blockgen</directory>-->
-      <!--<outputDirectory>/share/hadoop/${hadoop.component}/dynamometer-blockgen</outputDirectory>-->
-    <!--</fileSet>-->
     <fileSet>
       <directory>../hadoop-resourceestimator/target</directory>
       <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
diff --git a/hadoop-dist/pom.xml b/hadoop-dist/pom.xml
index a56b105616..07aa7b10a8 100644
--- a/hadoop-dist/pom.xml
+++ b/hadoop-dist/pom.xml
@@ -196,7 +196,6 @@
                     <argument>${project.version}</argument>
                     <argument>${project.build.directory}</argument>
                     <argument>${basedir}/../hadoop-tools</argument>
-                    <!--<argument>${basedir}/../hadoop-tools/hadoop-dynamometer</argument>-->
                   </arguments>
                 </configuration>
               </execution>