From 89f9c8604b2aeb14e66c8087847723ae530a09c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elek=2C=20M=C3=A1rton?= Date: Fri, 5 Apr 2019 17:52:28 +0200 Subject: [PATCH] HDDS-1385. Make the ozonesecure-mr environment definition version independent. Contributed by Elek, Marton. (#695) (cherry picked from commit d758c978735fc9c0adb232527b2c3c0bdce1bafa) --- hadoop-ozone/dist/src/main/compose/ozonesecure-mr/README.md | 6 +++--- .../src/main/compose/ozonesecure-mr/docker-compose.yaml | 6 +++--- .../dist/src/main/compose/ozonesecure-mr/docker-config | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/README.md b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/README.md index 82bf01abc0..14262701da 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/README.md +++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/README.md @@ -19,7 +19,7 @@ to Ozone OM/SCM/NM/DN and Kerberos KDC. ## Basic setup ``` -cd $(git rev-parse --show-toplevel)/hadoop-ozone/dist/target/ozone-*-SNAPSHOT/compose/ozonesecure-mr +cd $(git rev-parse --show-toplevel)/hadoop-ozone/dist/target/ozone-@project.version@/compose/ozonesecure-mr docker-compose up -d ``` @@ -47,7 +47,7 @@ docker-compose exec rm bash kinit -kt /etc/security/keytabs/hadoop.keytab hadoop/rm@EXAMPLE.COM export HADOOP_MAPRED_HOME=/opt/hadoop/share/hadoop/mapreduce -export HADOOP_CLASSPATH=$HADOOP_CLASSPATH:/opt/hadoop/share/hadoop/mapreduce/*:/opt/ozone/share/ozone/lib/hadoop-ozone-filesystem-lib-current-*-SNAPSHOT.jar +export HADOOP_CLASSPATH=$HADOOP_CLASSPATH:/opt/hadoop/share/hadoop/mapreduce/*:/opt/ozone/share/ozone/lib/hadoop-ozone-filesystem-lib-current-@project.version@.jar hadoop fs -mkdir /user hadoop fs -mkdir /user/hadoop @@ -70,4 +70,4 @@ yarn jar $HADOOP_MAPRED_HOME/hadoop-mapreduce-examples-*.jar pi 10 100 ### RandomWrite ``` yarn jar $HADOOP_MAPRED_HOME/hadoop-mapreduce-examples-*.jar randomwriter -Dtest.randomwrite.total_bytes=10000000 o3fs://bucket1.vol1/randomwrite.out -``` \ No newline at end of file +``` diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-compose.yaml index 426ec2fcfa..299b881859 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-compose.yaml +++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-compose.yaml @@ -86,7 +86,7 @@ services: env_file: - ./docker-config environment: - HADOOP_CLASSPATH: /opt/ozone/share/ozone/lib/hadoop-ozone-filesystem-lib-current-0.5.0-SNAPSHOT.jar + HADOOP_CLASSPATH: /opt/ozone/share/ozone/lib/hadoop-ozone-filesystem-lib-current-@project.version@.jar command: ["yarn", "resourcemanager"] nm: image: apache/hadoop:${HADOOP_VERSION} @@ -96,7 +96,7 @@ services: env_file: - ./docker-config environment: - HADOOP_CLASSPATH: /opt/ozone/share/ozone/lib/hadoop-ozone-filesystem-lib-current-0.5.0-SNAPSHOT.jar + HADOOP_CLASSPATH: /opt/ozone/share/ozone/lib/hadoop-ozone-filesystem-lib-current-@project.version@.jar WAIT_FOR: rm:8088 command: ["yarn","nodemanager"] jhs: @@ -109,6 +109,6 @@ services: env_file: - ./docker-config environment: - HADOOP_CLASSPATH: /opt/ozone/share/ozone/lib/hadoop-ozone-filesystem-lib-current-0.5.0-SNAPSHOT.jar + HADOOP_CLASSPATH: /opt/ozone/share/ozone/lib/hadoop-ozone-filesystem-lib-current-@project.version@.jar WAIT_FOR: rm:8088 command: ["yarn","timelineserver"] diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config index d5542ff9de..e449e4a3c3 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config +++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config @@ -72,7 +72,7 @@ MAPRED-SITE.XML_mapreduce.reduce.env=HADOOP_MAPRED_HOME=$HADOOP_HOME MAPRED-SITE.XML_mapreduce.map.memory.mb=2048 MAPRED-SITE.XML_mapreduce.reduce.memory.mb=2048 #MAPRED-SITE.XML_mapred.child.java.opts=-Xmx2048 -MAPRED-SITE.XML_mapreduce.application.classpath=/opt/hadoop/share/hadoop/mapreduce/*:/opt/hadoop/share/hadoop/mapreduce/lib/*:/opt/ozone/share/ozone/lib/hadoop-ozone-filesystem-lib-current-0.5.0-SNAPSHOT.jar +MAPRED-SITE.XML_mapreduce.application.classpath=/opt/hadoop/share/hadoop/mapreduce/*:/opt/hadoop/share/hadoop/mapreduce/lib/*:/opt/ozone/share/ozone/lib/hadoop-ozone-filesystem-lib-current-@project.version@.jar YARN-SITE.XML_yarn.app.mapreduce.am.staging-dir=/user YARN_SITE.XML_yarn.timeline-service.enabled=true