From 2e3f53173547273f8613facd557402e938119d14 Mon Sep 17 00:00:00 2001 From: Mahadev Konar Date: Tue, 22 Nov 2011 22:31:55 +0000 Subject: [PATCH] MAPREDUCE-3408. yarn-daemon.sh unconditionnaly sets yarn.root.logger (Bruno Mahe via mahadev) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1205200 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ hadoop-mapreduce-project/hadoop-yarn/bin/yarn-daemon.sh | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index a5008e0781..1b8748555a 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -164,6 +164,9 @@ Release 0.23.1 - Unreleased MAPREDUCE-3454. [Gridmix] TestDistCacheEmulation is broken (Hitesh Shah via mahadev) + MAPREDUCE-3408. yarn-daemon.sh unconditionnaly sets yarn.root.logger + (Bruno Mahe via mahadev) + Release 0.23.0 - 2011-11-01 INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-yarn/bin/yarn-daemon.sh b/hadoop-mapreduce-project/hadoop-yarn/bin/yarn-daemon.sh index 39bb76cbe9..99fcb0a550 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/bin/yarn-daemon.sh +++ b/hadoop-mapreduce-project/hadoop-yarn/bin/yarn-daemon.sh @@ -87,8 +87,8 @@ fi # some variables export YARN_LOGFILE=yarn-$YARN_IDENT_STRING-$command-$HOSTNAME.log -export YARN_ROOT_LOGGER="INFO,DRFA" -export YARN_JHS_LOGGER="INFO,JSA" +export YARN_ROOT_LOGGER=${YARN_ROOT_LOGGER:-INFO,DRFA} +export YARN_JHS_LOGGER=${YARN_JHS_LOGGER:-INFO,JSA} log=$YARN_LOG_DIR/yarn-$YARN_IDENT_STRING-$command-$HOSTNAME.out pid=$YARN_PID_DIR/yarn-$YARN_IDENT_STRING-$command.pid