From common-commits-return-94110-archive-asf-public=cust-asf.ponee.io@hadoop.apache.org Fri Apr 5 16:31:02 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id AE5E018060F for ; Fri, 5 Apr 2019 18:31:01 +0200 (CEST) Received: (qmail 29887 invoked by uid 500); 5 Apr 2019 16:31:00 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 29859 invoked by uid 99); 5 Apr 2019 16:31:00 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Apr 2019 16:31:00 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 011F489A56; Fri, 5 Apr 2019 16:30:59 +0000 (UTC) Date: Fri, 05 Apr 2019 16:30:59 +0000 To: "common-commits@hadoop.apache.org" Subject: [hadoop] branch trunk updated: HDDS-1385. Make the ozonesecure-mr environment definition version independent. Contributed by Elek, Marton. (#695) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155448185917.21460.6167114270676227139@gitbox.apache.org> From: ajay@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: hadoop X-Git-Refname: refs/heads/trunk X-Git-Reftype: branch X-Git-Oldrev: 0356b3699dec53109bd6ccff7db5177b5121ab6d X-Git-Newrev: 89f9c8604b2aeb14e66c8087847723ae530a09c8 X-Git-Rev: 89f9c8604b2aeb14e66c8087847723ae530a09c8 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. ajay pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/hadoop.git The following commit(s) were added to refs/heads/trunk by this push: new 89f9c86 HDDS-1385. Make the ozonesecure-mr environment definition version independent. Contributed by Elek, Marton. (#695) 89f9c86 is described below commit 89f9c8604b2aeb14e66c8087847723ae530a09c8 Author: Elek, Márton AuthorDate: Fri Apr 5 17:52:28 2019 +0200 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 +++--- .../dist/src/main/compose/ozonesecure-mr/docker-compose.yaml | 6 +++--- hadoop-ozone/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 82bf01a..1426270 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 426ec2f..299b881 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 d5542ff..e449e4a 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 --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org