Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D9F9E1036F for ; Wed, 19 Nov 2014 22:44:56 +0000 (UTC) Received: (qmail 82314 invoked by uid 500); 19 Nov 2014 22:44:47 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 82239 invoked by uid 500); 19 Nov 2014 22:44:47 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 82230 invoked by uid 99); 19 Nov 2014 22:44:47 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Nov 2014 22:44:47 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id ACCD4945849; Wed, 19 Nov 2014 22:44:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jianhe@apache.org To: common-commits@hadoop.apache.org Message-Id: <26f2feb9dade41609fdc75fda27250a7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: YARN-2878. Fix DockerContainerExecutor.apt.vm formatting. Contributed by Abin Shahab Date: Wed, 19 Nov 2014 22:44:46 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/trunk 73348a4af -> bc4ee5e06 YARN-2878. Fix DockerContainerExecutor.apt.vm formatting. Contributed by Abin Shahab Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bc4ee5e0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bc4ee5e0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bc4ee5e0 Branch: refs/heads/trunk Commit: bc4ee5e06f89b2037e0967f8ba91089ced4b7f0e Parents: 73348a4 Author: Jian He Authored: Wed Nov 19 14:44:25 2014 -0800 Committer: Jian He Committed: Wed Nov 19 14:44:25 2014 -0800 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../src/site/apt/DockerContainerExecutor.apt.vm | 18 +++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/bc4ee5e0/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index b394a91..7f61601 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -112,6 +112,9 @@ Release 2.7.0 - UNRELEASED YARN-2870. Updated the command to run the timeline server in the document. (Masatake Iwasaki via zjshen) + YARN-2878. Fix DockerContainerExecutor.apt.vm formatting. (Abin Shahab via + jianhe) + Release 2.6.0 - 2014-11-18 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/bc4ee5e0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/DockerContainerExecutor.apt.vm ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/DockerContainerExecutor.apt.vm b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/DockerContainerExecutor.apt.vm index 4573173..db75de9 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/DockerContainerExecutor.apt.vm +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/DockerContainerExecutor.apt.vm @@ -133,15 +133,18 @@ as at present the DockerContainerExecutor does not support per-job docker login. Currently you cannot configure any of the Docker settings with the job configuration. You can provide Mapper, Reducer, and ApplicationMaster environment overrides for the docker images, using the following 3 JVM properties respectively(only for MR jobs): - * mapreduce.map.env: You can override the mapper's image by passing -yarn.nodemanager.docker-container-executor.image-name= -to this JVM property. + + * mapreduce.map.env: You can override the mapper's image by passing + yarn.nodemanager.docker-container-executor.image-name= + to this JVM property. + * mapreduce.reduce.env: You can override the reducer's image by passing -yarn.nodemanager.docker-container-executor.image-name= -to this JVM property. + yarn.nodemanager.docker-container-executor.image-name= + to this JVM property. + * yarn.app.mapreduce.am.env: You can override the ApplicationMaster's image -by passing yarn.nodemanager.docker-container-executor.image-name= -to this JVM property. + by passing yarn.nodemanager.docker-container-executor.image-name= + to this JVM property. * {Docker Image requirements} @@ -185,6 +188,7 @@ jobs are started with the DockerContainerExecutor. * Pick a custom Docker image if you want. In this example, we'll use sequenceiq/hadoop-docker:2.4.1 from the docker hub repository. It has jdk, hadoop, and all the previously mentioned environment variables configured. + * Run: ----