big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

YARN-2878. Fix DockerContainerExecutor.apt.vm formatting. Contributed by Abin Shahab

Browse Source
This commit is contained in:
Jian He 2014-11-19 14:44:25 -08:00
parent 73348a4afd
commit bc4ee5e06f
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-yarn-project/CHANGES.txt
View File

@ -112,6 +112,9 @@ Release 2.7.0 - UNRELEASED
YARN-2870. Updated the command to run the timeline server in the document. YARN-2870. Updated the command to run the timeline server in the document.
(Masatake Iwasaki via zjshen) (Masatake Iwasaki via zjshen)
YARN-2878. Fix DockerContainerExecutor.apt.vm formatting. (Abin Shahab via
jianhe)
Release 2.6.0 - 2014-11-18 Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

16
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/DockerContainerExecutor.apt.vm
View File

@ -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. Currently you cannot configure any of the Docker settings with the job configuration.
You can provide Mapper, Reducer, and ApplicationMaster environment overrides for the You can provide Mapper, Reducer, and ApplicationMaster environment overrides for the
docker images, using the following 3 JVM properties respectively(only for MR jobs): 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 * mapreduce.map.env: You can override the mapper's image by passing
yarn.nodemanager.docker-container-executor.image-name=<your_image_name> yarn.nodemanager.docker-container-executor.image-name=<your_image_name>
to this JVM property. to this JVM property.
* mapreduce.reduce.env: You can override the reducer's image by passing * mapreduce.reduce.env: You can override the reducer's image by passing
yarn.nodemanager.docker-container-executor.image-name=<your_image_name> yarn.nodemanager.docker-container-executor.image-name=<your_image_name>
to this JVM property. to this JVM property.
* yarn.app.mapreduce.am.env: You can override the ApplicationMaster's image * yarn.app.mapreduce.am.env: You can override the ApplicationMaster's image
by passing yarn.nodemanager.docker-container-executor.image-name=<your_image_name> by passing yarn.nodemanager.docker-container-executor.image-name=<your_image_name>
to this JVM property. to this JVM property.
* {Docker Image requirements} * {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 * 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. docker hub repository. It has jdk, hadoop, and all the previously mentioned environment variables configured.
* Run: * Run:
---- ----