Repository: hadoop Updated Branches: refs/heads/branch-3.0.1 65c78d35a -> 496dc57cc
Revert "YARN-7190. Ensure only NM classpath in 2.x gets TSv2 related hbase jars, not the user classpath. Contributed by Varun Saxena." This reverts commit 53033c69f3cc05660d3af82995b88b3bc4b11bed. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/496dc57c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/496dc57c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/496dc57c Branch: refs/heads/branch-3.0.1 Commit: 496dc57cc2e4f4da117f7a8e3840aaeac0c1d2d0 Parents: 65c78d3 Author: Lei Xu <[email protected]> Authored: Fri Mar 16 10:22:19 2018 -0700 Committer: Lei Xu <[email protected]> Committed: Fri Mar 16 10:22:19 2018 -0700 ---------------------------------------------------------------------- .../resources/assemblies/hadoop-yarn-dist.xml | 27 -------------- hadoop-yarn-project/hadoop-yarn/bin/yarn | 6 ---- hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd | 6 ---- .../hadoop-yarn-server-resourcemanager/pom.xml | 1 - .../pom.xml | 23 ------------ .../hadoop-yarn-server-timelineservice/pom.xml | 1 - hadoop-yarn-project/pom.xml | 38 +++----------------- 7 files changed, 5 insertions(+), 97 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/496dc57c/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml ---------------------------------------------------------------------- diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml index 4de6240..289061f 100644 --- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml +++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml @@ -186,37 +186,10 @@ <include>**/*</include> </includes> </fileSet> - <!-- Copy dependecies from hadoop-yarn-server-timelineservice as well --> - <fileSet> - <directory>hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/target/lib</directory> - <outputDirectory>share/hadoop/${hadoop.component}/timelineservice/lib</outputDirectory> - </fileSet> </fileSets> <moduleSets> <moduleSet> - <includes> - <include>org.apache.hadoop:hadoop-yarn-server-timelineservice</include> - <include>org.apache.hadoop:hadoop-yarn-server-timelineservice-hbase</include> - </includes> - <binaries> - <outputDirectory>share/hadoop/${hadoop.component}/timelineservice</outputDirectory> - <includeDependencies>false</includeDependencies> - <unpack>false</unpack> - </binaries> - </moduleSet> - <moduleSet> - <includes> - <include>org.apache.hadoop:hadoop-yarn-server-timelineservice-hbase-tests</include> - </includes> - <binaries> - <outputDirectory>share/hadoop/${hadoop.component}/timelineservice/test</outputDirectory> - <includeDependencies>false</includeDependencies> - <unpack>false</unpack> - </binaries> - </moduleSet> - <moduleSet> <excludes> - <exclude>org.apache.hadoop:hadoop-yarn-server-timelineservice*</exclude> <exclude>org.apache.hadoop:hadoop-yarn-ui</exclude> </excludes> <binaries> http://git-wip-us.apache.org/repos/asf/hadoop/blob/496dc57c/hadoop-yarn-project/hadoop-yarn/bin/yarn ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/bin/yarn b/hadoop-yarn-project/hadoop-yarn/bin/yarn index cc5a5e5..0f19989 100755 --- a/hadoop-yarn-project/hadoop-yarn/bin/yarn +++ b/hadoop-yarn-project/hadoop-yarn/bin/yarn @@ -111,8 +111,6 @@ function yarncmd_case ;; nodemanager) HADOOP_SUBCMD_SUPPORTDAEMONIZATION="true" - hadoop_add_classpath "$HADOOP_YARN_HOME/$YARN_DIR/timelineservice/*" - hadoop_add_classpath "$HADOOP_YARN_HOME/$YARN_DIR/timelineservice/lib/*" HADOOP_CLASSNAME='org.apache.hadoop.yarn.server.nodemanager.NodeManager' # Backwards compatibility if [[ -n "${YARN_NODEMANAGER_HEAPSIZE}" ]]; then @@ -132,8 +130,6 @@ function yarncmd_case ;; resourcemanager) HADOOP_SUBCMD_SUPPORTDAEMONIZATION="true" - hadoop_add_classpath "$HADOOP_YARN_HOME/$YARN_DIR/timelineservice/*" - hadoop_add_classpath "$HADOOP_YARN_HOME/$YARN_DIR/timelineservice/lib/*" HADOOP_CLASSNAME='org.apache.hadoop.yarn.server.resourcemanager.ResourceManager' # Backwards compatibility if [[ -n "${YARN_RESOURCEMANAGER_HEAPSIZE}" ]]; then @@ -159,8 +155,6 @@ function yarncmd_case ;; timelinereader) HADOOP_SUBCMD_SUPPORTDAEMONIZATION="true" - hadoop_add_classpath "$HADOOP_YARN_HOME/$YARN_DIR/timelineservice/*" - hadoop_add_classpath "$HADOOP_YARN_HOME/$YARN_DIR/timelineservice/lib/*" HADOOP_CLASSNAME='org.apache.hadoop.yarn.server.timelineservice.reader.TimelineReaderServer' ;; timelineserver) http://git-wip-us.apache.org/repos/asf/hadoop/blob/496dc57c/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd b/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd index e1ac112..fed3d90 100644 --- a/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd +++ b/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd @@ -219,8 +219,6 @@ goto :eof :resourcemanager set CLASSPATH=%CLASSPATH%;%YARN_CONF_DIR%\rm-config\log4j.properties - set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\%YARN_DIR%\timelineservice\* - set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\%YARN_DIR%\timelineservice\lib\* set CLASS=org.apache.hadoop.yarn.server.resourcemanager.ResourceManager set YARN_OPTS=%YARN_OPTS% %YARN_RESOURCEMANAGER_OPTS% if defined YARN_RESOURCEMANAGER_HEAPSIZE ( @@ -250,8 +248,6 @@ goto :eof :timelinereader set CLASSPATH=%CLASSPATH%;%YARN_CONF_DIR%\timelineserver-config\log4j.properties - set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\%YARN_DIR%\timelineservice\* - set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\%YARN_DIR%\timelineservice\lib\* set CLASS=org.apache.hadoop.yarn.server.timelineservice.reader.TimelineReaderServer set YARN_OPTS=%YARN_OPTS% %YARN_TIMELINEREADER_OPTS% goto :eof @@ -264,8 +260,6 @@ goto :eof :nodemanager set CLASSPATH=%CLASSPATH%;%YARN_CONF_DIR%\nm-config\log4j.properties - set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\%YARN_DIR%\timelineservice\* - set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\%YARN_DIR%\timelineservice\lib\* set CLASS=org.apache.hadoop.yarn.server.nodemanager.NodeManager set YARN_OPTS=%YARN_OPTS% -server %HADOOP_NODEMANAGER_OPTS% if defined YARN_NODEMANAGER_HEAPSIZE ( http://git-wip-us.apache.org/repos/asf/hadoop/blob/496dc57c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml index f16ccdb..f3682da 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml @@ -191,7 +191,6 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-server-timelineservice</artifactId> - <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> http://git-wip-us.apache.org/repos/asf/hadoop/blob/496dc57c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/pom.xml index 7c35baf..b38f44c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/pom.xml @@ -57,13 +57,11 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-annotations</artifactId> - <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <scope>provided</scope> </dependency> <!-- 'mvn dependency:analyze' fails to detect use of this dependency --> @@ -77,19 +75,16 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-api</artifactId> - <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-common</artifactId> - <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-server-applicationhistoryservice</artifactId> - <scope>provided</scope> </dependency> <dependency> @@ -126,7 +121,6 @@ <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-server</artifactId> - <scope>provided</scope> <exclusions> <exclusion> <groupId>org.apache.hadoop</groupId> @@ -192,23 +186,6 @@ </additionnalDependencies> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <includeScope>runtime</includeScope> - <excludeGroupIds>org.slf4j,org.apache.hadoop,com.github.stephenc.findbugs</excludeGroupIds> - <outputDirectory>${project.build.directory}/lib</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/hadoop/blob/496dc57c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/pom.xml index 331886e..34dd1b0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/pom.xml @@ -38,7 +38,6 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/hadoop/blob/496dc57c/hadoop-yarn-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/pom.xml b/hadoop-yarn-project/pom.xml index 95c9352..6e1ff52 100644 --- a/hadoop-yarn-project/pom.xml +++ b/hadoop-yarn-project/pom.xml @@ -76,6 +76,10 @@ </dependency> <dependency> <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-yarn-server-timelineservice-hbase</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-server-router</artifactId> </dependency> </dependencies> @@ -159,44 +163,12 @@ </execution> </executions> </plugin> - <!-- Remove duplicate dependencies which exist in both yarn/lib folder and yarn/timelineservice/lib folder --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>dist</id> - <phase>prepare-package</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target> - <echo file="${project.build.directory}/remove-duplicate-timelineservice-jars.sh"> - yarnjardir="${project.build.directory}/${project.artifactId}-${project.version}/share/hadoop/yarn" - yarnlibdir="${yarnjardir}/lib/" - cd "${yarnjardir}/timelineservice/lib" - for jar in `ls` - do - if [ -f "${yarnlibdir}""${jar}" ];then - rm -rf ${jar} - echo "Removing duplicate jar $jar from share/hadoop/yarn/timelineservice/lib folder" - fi - done - </echo> - <exec executable="${shell-executable}" dir="${project.build.directory}" failonerror="true"> - <arg line="./remove-duplicate-timelineservice-jars.sh"/> - </exec> - </target> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> </profile> </profiles> + <reporting> <plugins> <plugin> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
