HDDS-468. Add version number to datanode plugin and ozone file system jar. Contributed by Bharat Viswanadham.
(cherry picked from commit a71aea732315ffc5c99c011369adfbeddb9a8c01) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b6ad84eb Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b6ad84eb Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b6ad84eb Branch: refs/heads/YARN-7402 Commit: b6ad84ebb1bf5f5f4c1fffe55a6b529ee43dd7a7 Parents: 001611c Author: Márton Elek <[email protected]> Authored: Tue Sep 18 11:00:51 2018 +0200 Committer: Márton Elek <[email protected]> Committed: Tue Sep 18 11:01:52 2018 +0200 ---------------------------------------------------------------------- dev-support/bin/ozone-dist-layout-stitching | 4 ++-- hadoop-dist/src/main/compose/ozone-hdfs/docker-compose.yaml | 2 +- hadoop-dist/src/main/compose/ozonefs/docker-compose.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b6ad84eb/dev-support/bin/ozone-dist-layout-stitching ---------------------------------------------------------------------- diff --git a/dev-support/bin/ozone-dist-layout-stitching b/dev-support/bin/ozone-dist-layout-stitching index f047c87..00854b4 100755 --- a/dev-support/bin/ozone-dist-layout-stitching +++ b/dev-support/bin/ozone-dist-layout-stitching @@ -145,11 +145,11 @@ run copy "${ROOT}/hadoop-ozone/tools/target/hadoop-ozone-tools-${HDDS_VERSION}" #shaded ozonefs mkdir -p "./share/hadoop/ozonefs" -cp "${ROOT}/hadoop-ozone/ozonefs/target/hadoop-ozone-filesystem-${HDDS_VERSION}.jar" "./share/hadoop/ozonefs/hadoop-ozone-filesystem.jar" +cp "${ROOT}/hadoop-ozone/ozonefs/target/hadoop-ozone-filesystem-${HDDS_VERSION}.jar" "./share/hadoop/ozonefs/hadoop-ozone-filesystem-${HDDS_VERSION}.jar" #shaded datanode service mkdir -p "./share/hadoop/ozoneplugin" -cp "${ROOT}/hadoop-ozone/objectstore-service/target/hadoop-ozone-objectstore-service-${HDDS_VERSION}-plugin.jar" "./share/hadoop/ozoneplugin/hadoop-ozone-datanode-plugin.jar" +cp "${ROOT}/hadoop-ozone/objectstore-service/target/hadoop-ozone-objectstore-service-${HDDS_VERSION}-plugin.jar" "./share/hadoop/ozoneplugin/hadoop-ozone-datanode-plugin-${HDDS_VERSION}.jar" # Optional documentation, could be missing http://git-wip-us.apache.org/repos/asf/hadoop/blob/b6ad84eb/hadoop-dist/src/main/compose/ozone-hdfs/docker-compose.yaml ---------------------------------------------------------------------- diff --git a/hadoop-dist/src/main/compose/ozone-hdfs/docker-compose.yaml b/hadoop-dist/src/main/compose/ozone-hdfs/docker-compose.yaml index ed18e5c..b89052d 100644 --- a/hadoop-dist/src/main/compose/ozone-hdfs/docker-compose.yaml +++ b/hadoop-dist/src/main/compose/ozone-hdfs/docker-compose.yaml @@ -33,7 +33,7 @@ services: - ../..:/opt/ozone command: ["hdfs","datanode"] environment: - HADOOP_CLASSPATH: /opt/ozone/share/hadoop/ozoneplugin/hadoop-ozone-datanode-plugin.jar + HADOOP_CLASSPATH: /opt/ozone/share/hadoop/ozoneplugin/*.jar env_file: - ./docker-config ozoneManager: http://git-wip-us.apache.org/repos/asf/hadoop/blob/b6ad84eb/hadoop-dist/src/main/compose/ozonefs/docker-compose.yaml ---------------------------------------------------------------------- diff --git a/hadoop-dist/src/main/compose/ozonefs/docker-compose.yaml b/hadoop-dist/src/main/compose/ozonefs/docker-compose.yaml index 1671c39..a1e8748 100644 --- a/hadoop-dist/src/main/compose/ozonefs/docker-compose.yaml +++ b/hadoop-dist/src/main/compose/ozonefs/docker-compose.yaml @@ -55,5 +55,5 @@ services: env_file: - ./docker-config environment: - HADOOP_CLASSPATH: /opt/ozone/share/hadoop/ozonefs/hadoop-ozone-filesystem.jar + HADOOP_CLASSPATH: /opt/ozone/share/hadoop/ozonefs/*.jar command: ["watch","-n","100000","ls"] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
