From f57de0d6dde05abf9190a86c5e241e54e976fb82 Mon Sep 17 00:00:00 2001 From: Arun Murthy Date: Fri, 27 Jan 2012 08:49:18 +0000 Subject: [PATCH] MAPREDUCE-3693. Added mapreduce.admin.user.env to mapred-default.xml. Contributed by Roman Shapshonik. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1236594 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../src/main/resources/mapred-default.xml | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 57fe545e30..cf390a1370 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -203,6 +203,9 @@ Release 0.23.1 - Unreleased MAPREDUCE-3699. Increased RPC handlers for all YARN servers to reasonable values for working at scale. (Hitesh Shah via vinodkv) + MAPREDUCE-3693. Added mapreduce.admin.user.env to mapred-default.xml. + (Roman Shapshonik via acmurthy) + OPTIMIZATIONS MAPREDUCE-3567. Extraneous JobConf objects in AM heap. (Vinod Kumar diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml index fc5b8b23f8..920f8df455 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml @@ -440,6 +440,16 @@ + + mapreduce.admin.user.env + LD_LIBRARY_PATH=$HADOOP_COMMON_HOME/lib/native + Expert: Additional execution environment entries for + map and reduce task processes. This is not an additive property. + You must preserve the original value if you want your map and + reduce tasks to have access to native libraries (compression, etc). + + + mapreduce.task.tmp.dir ./tmp